diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-09 19:06:27 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-03-12 22:33:26 +0000 |
| commit | 7197e9c6711f3869890c3406dcb5eb49ef786ac7 (patch) | |
| tree | 2b497585805970ee6dbc9a21d85a5017dc3a97b6 | |
| parent | 7f2a39f9ba7541c6a2ec609f096b09ee135e0673 (diff) | |
| download | wireshark-7197e9c6711f3869890c3406dcb5eb49ef786ac7.tar.gz wireshark-7197e9c6711f3869890c3406dcb5eb49ef786ac7.tar.bz2 wireshark-7197e9c6711f3869890c3406dcb5eb49ef786ac7.zip | |
ieee80211-prism: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
Change-Id: Ic3c4a4347ab501c1ee22a25dd3dd41609d28418f
Reviewed-on: https://code.wireshark.org/review/20467
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-ieee80211-prism.c | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index 60d943d144..2a3001c40f 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -587,29 +587,16 @@ prism_rate_return_sig(guint32 rate_phy1, guint32 rate_phy2, struct ieee_802_11_p } } - if (stbc) { - result = wmem_strdup_printf(wmem_packet_scope(), - "%u.%u Mb/s VHT MCS %d NSS %d Partial AID %d BW %d MHz %s %s %s GroupID %d %s %s", - disp_rate/10, disp_rate%10, - mcs, nss, partial_aid, bw, - sgi ? "[SGI]" : "", - ldpc ? "[LDPC]" : "", - stbc ? "[STBC]" : "", - groupid, - "[SU_PPDU]", - txbf ? "[TxBF]" : ""); - } else { - result = wmem_strdup_printf(wmem_packet_scope(), - "%u.%u Mb/s VHT MCS %d NSS %d Partial AID %d BW %d MHz %s %s %s GroupID %d %s %s", - disp_rate/10, disp_rate%10, - mcs, nss, partial_aid, bw, - sgi ? "[SGI]" : "", - ldpc ? "[LDPC]" : "", - stbc ? "[STBC]" : "", - groupid, - "[SU_PPDU]", - txbf ? "[TxBF]" : ""); - } + result = wmem_strdup_printf(wmem_packet_scope(), + "%u.%u Mb/s VHT MCS %d NSS %d Partial AID %d BW %d MHz %s %s %s GroupID %d %s %s", + disp_rate/10, disp_rate%10, + mcs, nss, partial_aid, bw, + sgi ? "[SGI]" : "", + ldpc ? "[LDPC]" : "", + stbc ? "[STBC]" : "", + groupid, + "[SU_PPDU]", + txbf ? "[TxBF]" : ""); } else { nsts_u1 = (sig_a_1 >> 10) & 0x7; nsts_u2 = (sig_a_1 >> 13) & 0x7; |