diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-09 18:55:59 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-03-12 12:16:20 +0000 |
| commit | 6d584aad721515da570185e7f8e9e5a21540b0d3 (patch) | |
| tree | b73383bd1fb54d24af2d48c2c1e012989bc9711e /epan/dissectors/packet-gmr1_rach.c | |
| parent | 3baae12c4f83451d291176df4c6d9d5499fcbcdc (diff) | |
gmr_rach: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
Change-Id: I3313ea62fd86b0a7a3ae6dfbc40bd6e0841316a2
Reviewed-on: https://code.wireshark.org/review/20466
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/packet-gmr1_rach.c')
| -rw-r--r-- | epan/dissectors/packet-gmr1_rach.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c index 5e7dff7d35..e778ddfafe 100644 --- a/epan/dissectors/packet-gmr1_rach.c +++ b/epan/dissectors/packet-gmr1_rach.c @@ -895,11 +895,13 @@ dissect_gmr1_rach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat } else if (ec == 7) { desc = "GMR-1 GmPRS Channel Request Type 2 (RACH)"; ies |= RACH_IE_CLASS2_GMPRS_TYPE2; +#if 0 /* Fix -Wduplicated-branches */ } else if (ec == 12) { /* Position verification exists in both GMR-1 and GmPRS-1 * I have no idea how to differentiate them ... but from * off-the-air data, it seems it used the GMR-1 format */ ies |= RACH_IE_CLASS2_GMR1; +#endif } else { ies |= RACH_IE_CLASS2_GMR1; } |