From b3103837a84f82a8b4aa202ac805e8b9c2dba57d Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 3 May 2017 18:44:17 +0200 Subject: ixveriwave: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang Change-Id: Ia4ff13fb9ab57ad6749ffdcb4a2b2243c98747b6 Reviewed-on: https://code.wireshark.org/review/21515 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-ixveriwave.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'epan') diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index e4a5879a15..60245dbf8a 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -1437,7 +1437,7 @@ dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da } proto_tree_add_item(rfinfo_contextp_tree, hf_radiotap_rfinfo_sigbwevmD, tvb, offset, 1, ENC_NA); - offset += 2; + /*offset += 2;*/ } } if (cmd_type !=3) //only RF @@ -1570,7 +1570,6 @@ ethernettap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_t if (length_remaining >= 4) { proto_tree_add_item(tap_tree, hf_ixveriwave_vw_l4id, tvb, offset, 4, ENC_LITTLE_ENDIAN); - offset +=4; length_remaining -=4; } @@ -1952,8 +1951,6 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vht_ndp_flag = tvb_get_guint8(tvb,offset) & 0x80; offset++; - vw_flags = tvb_get_letohs(tvb, 16); /**extract the transmit/rcvd direction flag**/ - /* MCS index */ mcs_index = tvb_get_guint8(tvb, offset); offset++; @@ -2202,7 +2199,7 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* VHT-SIG */ /* XXX - does this include VHT-SIG-B? */ - offset = decode_vht_sig(tap_tree, tvb, offset, &phdr); + decode_vht_sig(tap_tree, tvb, offset, &phdr); } } } @@ -2704,7 +2701,6 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset +=2; proto_tree_add_item(vw_l2l4info_tree, hf_radiotap_clientidvalid, tvb, offset, 1, ENC_NA); - bssidv = ((tvb_get_guint8(tvb, offset)& 0x40) >> 6); proto_tree_add_item(vw_l2l4info_tree, hf_radiotap_bssidvalid, tvb, offset, 1, ENC_NA); proto_tree_add_item(vw_l2l4info_tree, hf_radiotap_unicastormulticast, tvb, offset, 1, ENC_NA); offset++; @@ -2785,7 +2781,6 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } offset +=3; - vw_errors = tvb_get_letohl(tvb, offset); /* build the individual subtrees for the various types of error flags */ /* NOTE: as the upper 16 bits aren't used at the moment, we pretend that */ @@ -2843,7 +2838,7 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(vw_l2l4info_tree, hf_radiotap_vw_tx_retrycount, tvb, offset+2, 1, ENC_NA); proto_tree_add_item(vw_l2l4info_tree, hf_radiotap_vw_tx_factorydebug, tvb, offset+2, 2, ENC_LITTLE_ENDIAN); } - offset +=4; + /*offset +=4;*/ if (vwl2l4t && log_mode) proto_item_append_text(vwl2l4t, " (Reduced)"); -- cgit v1.2.3