summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-batadv.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2015-01-08 11:36:21 +0100
committerMichael Mann <mmann78@netscape.net>2015-01-08 13:00:23 +0000
commita3e934fa2afb0cb5979f67a4e1e82a3fcec82d2a (patch)
tree22e54bdf21f719764a5aaef8a1a96f2a9adb5ae0 /epan/dissectors/packet-batadv.c
parentbd1cd01c7d4e65d92b49eae89ea3efc5a6c95568 (diff)
downloadwireshark-a3e934fa2afb0cb5979f67a4e1e82a3fcec82d2a.tar.gz
BATADV: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I3c33511389aa2f4b3eed73f1c712561b20e18bf7 Reviewed-on: https://code.wireshark.org/review/6395 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-batadv.c')
-rw-r--r--epan/dissectors/packet-batadv.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c
index 28810f1133..c936ba6473 100644
--- a/epan/dissectors/packet-batadv.c
+++ b/epan/dissectors/packet-batadv.c
@@ -1721,7 +1721,6 @@ static int dissect_batadv_iv_ogm_v15(tvbuff_t *tvb, int offset,
offset, 4, ENC_BIG_ENDIAN);
offset += 4;
- orig_addr = tvb_get_ptr(tvb, offset, 6);
TVB_SET_ADDRESS(&iv_ogm_packeth->orig, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, offset, 6);
@@ -2408,7 +2407,6 @@ static void dissect_batadv_icmp_v15(tvbuff_t *tvb, packet_info *pinfo,
offset, 1, ENC_BIG_ENDIAN);
offset += 1;
- dst_addr = tvb_get_ptr(tvb, offset, 6);
TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->dst, AT_ETHER, tvb, offset, 6);
@@ -2417,7 +2415,6 @@ static void dissect_batadv_icmp_v15(tvbuff_t *tvb, packet_info *pinfo,
6, ENC_NA);
offset += 6;
- orig_addr = tvb_get_ptr(tvb, offset, 6);
TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, offset, 6);
@@ -3009,7 +3006,6 @@ static void dissect_batadv_unicast_frag_v15(tvbuff_t *tvb, packet_info *pinfo,
tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
- dest_addr = tvb_get_ptr(tvb, offset, 6);
TVB_SET_ADDRESS(&unicast_frag_packeth->dest, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->dst, AT_ETHER, tvb, offset, 6);
@@ -3914,7 +3910,6 @@ static void dissect_batadv_unicast_tvlv_v15(tvbuff_t *tvb, packet_info *pinfo,
/* Skip 1 byte of padding. */
offset += 1;
- dest_addr = tvb_get_ptr(tvb, offset, 6);
TVB_SET_ADDRESS(&unicast_tvlv_packeth->dest, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->dst, AT_ETHER, tvb, offset, 6);
@@ -3922,7 +3917,6 @@ static void dissect_batadv_unicast_tvlv_v15(tvbuff_t *tvb, packet_info *pinfo,
tvb, offset, 6, ENC_NA);
offset += 6;
- src_addr = tvb_get_ptr(tvb, offset, 6);
TVB_SET_ADDRESS(&unicast_tvlv_packeth->src, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, offset, 6);
TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, offset, 6);