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

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>
This commit is contained in:
Alexis La Goutte 2017-03-09 18:55:59 +01:00 committed by Peter Wu
parent 3baae12c4f
commit 6d584aad72
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-gmr1_rach.c
View File

@ -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;
}