diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-05 20:52:16 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-03-12 12:12:45 +0000 |
| commit | 135557f39be3c07371a45798ffd9f1e4fa07c520 (patch) | |
| tree | 1885f6766d4273d7205e24fe0a4df594e47f2c92 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | c8020c7f6253ae606736326b41e572630c73ee59 (diff) | |
catapult-dct2000: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
Change-Id: If3afda940b40500e067467b341f192bbaef173bc
Reviewed-on: https://code.wireshark.org/review/20425
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index e3c47895ed..bfaf7132e7 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -2624,7 +2624,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo hf_catapult_dct2000_ipprim_src_addr_v4 : hf_catapult_dct2000_ipprim_src_addr_v6, tvb, source_addr_offset, source_addr_length, - (source_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); + ENC_NA); /* Add hidden item for "side-less" addr */ addr_ti = proto_tree_add_item(ipprim_tree, @@ -2632,7 +2632,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo hf_catapult_dct2000_ipprim_addr_v4 : hf_catapult_dct2000_ipprim_addr_v6, tvb, source_addr_offset, source_addr_length, - (source_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); + ENC_NA); PROTO_ITEM_SET_HIDDEN(addr_ti); } if (source_port_offset != 0) { @@ -2664,7 +2664,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo hf_catapult_dct2000_ipprim_dst_addr_v4 : hf_catapult_dct2000_ipprim_dst_addr_v6, tvb, dest_addr_offset, dest_addr_length, - (dest_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); + ENC_NA); /* Add hidden item for "side-less" addr */ addr_ti = proto_tree_add_item(ipprim_tree, @@ -2672,7 +2672,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo hf_catapult_dct2000_ipprim_addr_v4 : hf_catapult_dct2000_ipprim_addr_v6, tvb, dest_addr_offset, dest_addr_length, - (dest_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); + ENC_NA); PROTO_ITEM_SET_HIDDEN(addr_ti); } if (dest_port_offset != 0) { @@ -2773,7 +2773,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo hf_catapult_dct2000_sctpprim_dst_addr_v4 : hf_catapult_dct2000_sctpprim_dst_addr_v6, tvb, dest_addr_offset, dest_addr_length, - (dest_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); + ENC_NA); /* Add hidden item for "side-less" addr */ addr_ti = proto_tree_add_item(sctpprim_tree, @@ -2781,7 +2781,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo hf_catapult_dct2000_sctpprim_addr_v4 : hf_catapult_dct2000_sctpprim_addr_v6, tvb, dest_addr_offset, dest_addr_length, - (dest_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); + ENC_NA); PROTO_ITEM_SET_HIDDEN(addr_ti); } |