summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2011-04-21 13:31:42 +0000
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2011-04-21 13:31:42 +0000
commitace0276b1cbe2dcaddb51ae2606e6272bc949e07 (patch)
tree4c3e8f0c90a8e7fada6ea845f681326ae1d5d059 /epan
parent60ff532086a9473e71a13ce5054a23084dd153ba (diff)
downloadwireshark-ace0276b1cbe2dcaddb51ae2606e6272bc949e07.tar.gz
Fix Dead Store (Dead nested assignment) Warning found by Clang
svn path=/trunk/; revision=36753
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-assa_r3.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c
index 9b0faac01c..93537ff9a4 100644
--- a/epan/dissectors/packet-assa_r3.c
+++ b/epan/dissectors/packet-assa_r3.c
@@ -5631,7 +5631,6 @@ static gint dissect_r3_packet (tvbuff_t *tvb, guint start_offset, packet_info *p
guint32 packetCRC = tvb_get_letohs (tvb, offset + 5);
guint32 packetXor = tvb_get_guint8 (tvb, offset + 7);
guint32 calculatedCRC = 0;
- guint32 calculatedXor = 0;
if ((calculatedCRC = utilCrcCalculate (tvb_get_ptr (tvb, start_offset + 1, packetLen - 3), packetLen - 3, 0x0000)) == packetCRC)
proto_tree_add_uint_format (tail_tree, hf_r3_crc, tvb, offset + 5, 2, packetCRC, "CRC: 0x%04x (correct)", packetCRC);
@@ -5644,7 +5643,7 @@ static gint dissect_r3_packet (tvbuff_t *tvb, guint start_offset, packet_info *p
PROTO_ITEM_SET_GENERATED (tmp_item);
}
- if ((calculatedXor = (packetLen ^ 0xff)) == packetXor)
+ if ((packetLen ^ 0xff) == (int)packetXor)
proto_tree_add_uint_format (tail_tree, hf_r3_xor, tvb, offset + 7, 1, packetXor, "XOR: 0x%02x (correct)", packetXor);
else
{