Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=41299

diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c
index 32ba83845a56e32715293da75a3d856082249993..e424c3f97a0562a3799ab34f2c58dc45cb1dc93a 100644 (file)
--- a/asn1/c1222/packet-c1222-template.c
+++ b/asn1/c1222/packet-c1222-template.c
@@ -427,7 +427,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm
     case C1222_CMD_FULL_READ:
        if (*length >= 2) {
            table = tvb_get_ntohs(tvb, *offset);
-           item = proto_tree_add_uint(tree, hf_c1222_read_table, tvb, *offset, 2, table);
+           proto_tree_add_uint(tree, hf_c1222_read_table, tvb, *offset, 2, table);
            proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d)",
                    val_to_str(cmd,commandnames,"Unknown (0x%02x)"), 
                    val_to_str((table >> 8) & 0xF8, tableflags,"Unknown (0x%04x)"), table & 0x7FF);
@@ -440,7 +440,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm
     case C1222_CMD_PARTIAL_READ_OFFSET:
        if (*length >= 7) {
            table = tvb_get_ntohs(tvb, *offset);
-           item = proto_tree_add_uint(tree, hf_c1222_read_table, tvb, *offset, 2, table);
+           proto_tree_add_uint(tree, hf_c1222_read_table, tvb, *offset, 2, table);
            *offset += 2;
            *length -= 2;
            proto_tree_add_item(tree, hf_c1222_read_offset, tvb, *offset, 3, ENC_BIG_ENDIAN);
@@ -834,7 +834,7 @@ ber_len_ok(tvbuff_t *tvb, int offset)
          return TRUE;
        } else if (tvb_offset_exists(tvb, offset)) {
          ch = tvb_get_guint8(tvb, offset);
-         offset++;
+         /*offset++;*/
          if (!(ch & 0x80)) {
            return TRUE;
          }

diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c
index 165dcb5d6e295c895844c32fdf655573c2693657..e32ef8ce63a22522d0afb4c4c13d7d2b4fcb60c4 100644 (file)
--- a/epan/dissectors/packet-c1222.c
+++ b/epan/dissectors/packet-c1222.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-c1222.c                                                             */
-/* ../../../tools/asn2wrs.py -b -p c1222 -c ../../../asn1/c1222/c1222.cnf -s ../../../asn1/c1222/packet-c1222-template -D ../../../asn1/c1222 -O ../../../epan/dissectors c1222.asn */
+/* ../../tools/asn2wrs.py -b -p c1222 -c ./c1222.cnf -s ./packet-c1222-template -D . -O ../../epan/dissectors c1222.asn */
 
 /* Input file: packet-c1222-template.c */
 
@@ -472,7 +472,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm
     case C1222_CMD_FULL_READ:
        if (*length >= 2) {
            table = tvb_get_ntohs(tvb, *offset);
-           item = proto_tree_add_uint(tree, hf_c1222_read_table, tvb, *offset, 2, table);
+           proto_tree_add_uint(tree, hf_c1222_read_table, tvb, *offset, 2, table);
            proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d)",
                    val_to_str(cmd,commandnames,"Unknown (0x%02x)"), 
                    val_to_str((table >> 8) & 0xF8, tableflags,"Unknown (0x%04x)"), table & 0x7FF);
@@ -485,7 +485,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm
     case C1222_CMD_PARTIAL_READ_OFFSET:
        if (*length >= 7) {
            table = tvb_get_ntohs(tvb, *offset);
-           item = proto_tree_add_uint(tree, hf_c1222_read_table, tvb, *offset, 2, table);
+           proto_tree_add_uint(tree, hf_c1222_read_table, tvb, *offset, 2, table);
            *offset += 2;
            *length -= 2;
            proto_tree_add_item(tree, hf_c1222_read_offset, tvb, *offset, 3, ENC_BIG_ENDIAN);
@@ -879,7 +879,7 @@ ber_len_ok(tvbuff_t *tvb, int offset)
          return TRUE;
        } else if (tvb_offset_exists(tvb, offset)) {
          ch = tvb_get_guint8(tvb, offset);
-         offset++;
+         /*offset++;*/
          if (!(ch & 0x80)) {
            return TRUE;
          }

diff --git a/epan/dissectors/packet-c1222.h b/epan/dissectors/packet-c1222.h
index a6af31983140e2eeec5398576d3bea4899662b75..780db2db7f78d11b036c410654db0ffa8ee99ac6 100644 (file)
--- a/epan/dissectors/packet-c1222.h
+++ b/epan/dissectors/packet-c1222.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-c1222.h                                                             */
-/* ../../../tools/asn2wrs.py -b -p c1222 -c ../../../asn1/c1222/c1222.cnf -s ../../../asn1/c1222/packet-c1222-template -D ../../../asn1/c1222 -O ../../../epan/dissectors c1222.asn */
+/* ../../tools/asn2wrs.py -b -p c1222 -c ./c1222.cnf -s ./packet-c1222-template -D . -O ../../epan/dissectors c1222.asn */
 
 /* Input file: packet-c1222-template.h */