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

svn path=/trunk/; revision=42513

6 files changed, 19 insertions, 17 deletions

diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c
index 62c916a711..c8da6c4d29 100644
--- a/epan/dissectors/packet-erldp.c
+++ b/epan/dissectors/packet-erldp.c
@@ -422,13 +422,13 @@ static void dissect_erldp_handshake(tvbuff_t *tvb, packet_info *pinfo, proto_tre
       proto_tree_add_item(tree, hf_erldp_challenge, tvb, offset, 4, ENC_BIG_ENDIAN);
       offset += 4;
       proto_tree_add_item(tree, hf_erldp_digest, tvb, offset, 16, ENC_NA);
-      offset += 16;
+      /*offset += 16;*/
       col_add_str(pinfo->cinfo, COL_INFO, "SEND_CHALLENGE_REPLY");
       break;
 
     case 'a' :
       proto_tree_add_item(tree, hf_erldp_digest, tvb, offset, 16, ENC_NA);
-      offset += 16;
+      /*offset += 16;*/
       col_add_str(pinfo->cinfo, COL_INFO, "SEND_CHALLENGE_ACK");
       break;
 
@@ -487,7 +487,7 @@ static void dissect_erldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
       }
       offset = dissect_etf_type("ControlMessage", pinfo, tvb, offset, erldp_tree);
       if (tvb_length_remaining(tvb, offset) > 0)
-        offset = dissect_etf_type("Message", pinfo, tvb, offset, erldp_tree);
+        dissect_etf_type("Message", pinfo, tvb, offset, erldp_tree);
       break;
 
     default:
diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c
index b6fbf1d017..b1b679a59e 100644
--- a/epan/dissectors/packet-etch.c
+++ b/epan/dissectors/packet-etch.c
@@ -397,7 +397,7 @@ read_array_type(unsigned int *offset, tvbuff_t *tvb, proto_tree *etch_tree)
 
   read_type(offset, tvb, etch_tree);
   if (type_code == ETCH_TC_CUSTOM) {
-    type_code = read_type(offset, tvb, etch_tree);
+    read_type(offset, tvb, etch_tree);
     proto_tree_add_item(etch_tree, hf_etch_value, tvb, *offset, 4,
                         ENC_BIG_ENDIAN);
     (*offset) += 4;
diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c
index 3be25b63dc..81415d35f3 100644
--- a/epan/dissectors/packet-fcgi.c
+++ b/epan/dissectors/packet-fcgi.c
@@ -141,7 +141,7 @@ dissect_nv_pairs(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len)
    }
 }
 
-static void
+static int
 dissect_begin_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len)
 {
    proto_item *br;
@@ -159,7 +159,7 @@ dissect_begin_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16
 
    offset += 5;
 
-   return;
+   return offset;
 }
 
 static void
@@ -170,7 +170,7 @@ dissect_abort_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16
    return;
 }
 
-static void
+static int
 dissect_end_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len)
 {
    proto_item *er;
@@ -187,7 +187,7 @@ dissect_end_request(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 l
 
    offset += 3;
 
-   return;
+   return offset;
 }
 
 static void
@@ -318,7 +318,7 @@ dissect_fcgi_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
       if (plen > 0) {
          proto_tree_add_item(fcgi_tree, hf_fcgi_padding_data, tvb, offset, plen, ENC_NA);
-         offset += plen;
+         /*offset += plen;*/
       }
    }
 }
diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c
index 39a9635102..3a7de7aade 100644
--- a/epan/dissectors/packet-hdfs.c
+++ b/epan/dissectors/packet-hdfs.c
@@ -232,7 +232,7 @@ dissect_data (tvbuff_t *tvb, proto_tree *hdfs_tree, guint offset) {
 response to a get protocol version message
 contains a type length, type name and the value
 */
-static void
+static int
 dissect_resp_long (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
     /* get length that we just dissected */
     int length = tvb_get_ntohs(tvb, offset);
@@ -247,13 +247,15 @@ dissect_resp_long (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
 
     /* the value */
     proto_tree_add_item(hdfs_tree, hf_hdfs_prover, tvb, offset, 8, ENC_BIG_ENDIAN);
-        offset += 8;
+    offset += 8;
+
+    return offset;
 }
 
 /*
 Response to a file status message
 */
-static void
+static int
 dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
 
     int length;
@@ -324,6 +326,8 @@ dissect_resp_filestatus (tvbuff_t *tvb, proto_tree *hdfs_tree, int offset) {
     /* group name */
     proto_tree_add_item(hdfs_tree, hf_hdfs_groupname, tvb, offset, length, ENC_ASCII|ENC_NA);
     offset += length;
+
+    return offset;
 }
 
 
@@ -598,7 +602,7 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
                     /* the value of the parameter */
                     proto_tree_add_item(hdfs_tree, hf_hdfs_paramval, tvb, offset, length, ENC_ASCII|ENC_NA);
-                    offset += length;
+                    /*offset += length;*/
                 }
             }
 
@@ -618,7 +622,7 @@ dissect_hdfs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 offset += 1;
 
                 proto_tree_add_item(hdfs_tree, hf_hdfs_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
-                offset += 1;
+                /*offset += 1;*/
 
             } else {
                 /* second authentication packet */
diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c
index 8a8b484190..09ad262800 100644
--- a/epan/dissectors/packet-icep.c
+++ b/epan/dissectors/packet-icep.c
@@ -331,7 +331,7 @@ static void dissect_ice_facet(proto_tree *tree, int hf_icep,
 			return;
 		}
 
-		offset += consumed_facet;
+		/*offset += consumed_facet;*/
 		(*consumed) += consumed_facet;
 		return;
 	}
diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c
index dcdc14d07b..91c9e7a73e 100644
--- a/epan/dissectors/packet-ifcp.c
+++ b/epan/dissectors/packet-ifcp.c
@@ -276,7 +276,6 @@ dissect_ifcpflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 	if(flags&IFCP_FLAGS_SPC){
 		proto_item_append_text(item, "  SPC");
 	}
-	flags&=(~IFCP_FLAGS_SPC);
 
 
 	offset++;
@@ -310,7 +309,6 @@ dissect_commonflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 	if(flags&IFCP_COMMON_FLAGS_CRCV){
 		proto_item_append_text(item, "  CRCV");
 	}
-	flags&=(~IFCP_COMMON_FLAGS_CRCV);
 }
 
 static void