osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

v150fw: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7 

Change-Id: I04e781b12a2b89999bf628ceaa66b8527dd591aa
Reviewed-on: https://code.wireshark.org/review/20471
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Alexis La Goutte 2017-03-09 19:24:09 +01:00 committed by Peter Wu
parent 096dd79465
commit 43a08c90a5
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-v150fw.c
View File

@ -308,7 +308,6 @@ dissect_v150fw(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *da
proto_item *ti;
proto_tree *v150fw_tree, *field_tree;
guint8 extb, ric;
guint16 ext_len = 0;
gint payload_length;
unsigned int offset = 0;
@ -324,9 +323,6 @@ dissect_v150fw(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *da
extb = tvb_get_guint8(tvb, offset) & 0x01; /* extension bit */
ric = tvb_get_guint8(tvb, offset + 1);
if(extb && payload_length >= 6) /* get optional extension fields */
ext_len = tvb_get_ntohs(tvb, offset + 4) & 0x07FF;
proto_tree_add_item(v150fw_tree, hf_v150fw_event_id, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(v150fw_tree, hf_v150fw_force_response_bit, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(v150fw_tree, hf_v150fw_extension_bit, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -376,13 +372,9 @@ dissect_v150fw(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *da
if(extb && payload_length >= 6) /* display optional extension fields */
{
proto_tree_add_item(v150fw_tree, hf_v150fw_reserved, tvb, offset, 2, ENC_BIG_ENDIAN);
if(ext_len != (payload_length - 6))
{
/* TODO - ext field len doesn't match actual len... that isn't illegal, but is perhaps worth noting */
proto_tree_add_item(v150fw_tree, hf_v150fw_extension_len, tvb, offset, 2, ENC_BIG_ENDIAN);
} else {
proto_tree_add_item(v150fw_tree, hf_v150fw_extension_len, tvb, offset, 2, ENC_BIG_ENDIAN);
}
/* TODO ext field len doesn't match actual len (ext_len != (payload_length - 6)),
* that isn't illegal, but is perhaps worth noting */
proto_tree_add_item(v150fw_tree, hf_v150fw_extension_len, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
/* display optional extension fields */