diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-05 20:54:18 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-03-13 00:02:30 +0000 |
| commit | 75cbd387dbe92be1d5bfafd69d49716e97a9c3bf (patch) | |
| tree | 703a26f6b5c9d5b6416f08ba6cb5a17ddeea8026 /epan | |
| parent | 7197e9c6711f3869890c3406dcb5eb49ef786ac7 (diff) | |
| download | wireshark-75cbd387dbe92be1d5bfafd69d49716e97a9c3bf.tar.gz | |
cigi: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
Change-Id: I1f755c876150f204cce95932698c3f4e96fd465d
Reviewed-on: https://code.wireshark.org/review/20426
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-cigi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index c08f4e7c19..6e64c8195a 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -3378,8 +3378,10 @@ cigi3_add_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *cigi_tree) offset = cigi3_add_event_notification(tvb, cigi_packet_tree, offset); } else if ( packet_id == CIGI3_PACKET_ID_IMAGE_GENERATOR_MESSAGE ) { offset = cigi3_add_image_generator_message(tvb, cigi_packet_tree, offset); +#if 0 /* Fix -Wduplicated-branches */ } else if ( packet_id >= CIGI3_PACKET_ID_USER_DEFINED_MIN && packet_id <= CIGI3_PACKET_ID_USER_DEFINED_MAX ) { offset = cigi_add_data(tvb, cigi_packet_tree, offset); +#endif } else { offset = cigi_add_data(tvb, cigi_packet_tree, offset); } |