diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-05 20:45:56 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-04-06 11:05:10 +0000 |
| commit | 4baa0c222272a0dc5e5383952d842d3c31af77c9 (patch) | |
| tree | 850490d7573b730ea17cdbb8ed6728c49b9fb356 /epan/dissectors/packet-adb.c | |
| parent | a771a12a2d13277b02346cd66df2738db2470d8a (diff) | |
adb: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
Change-Id: Iaa441f2f1c6147effe47d735d296f3c496518796
Reviewed-on: https://code.wireshark.org/review/20424
Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-adb.c')
| -rw-r--r-- | epan/dissectors/packet-adb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-adb.c b/epan/dissectors/packet-adb.c index cf3d526054..cda947ffdb 100644 --- a/epan/dissectors/packet-adb.c +++ b/epan/dissectors/packet-adb.c @@ -438,16 +438,14 @@ dissect_adb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) data_length = command_data->data_length; crc32 = command_data->crc32; - if (direction == P2P_DIR_SENT) + if (direction == P2P_DIR_SENT) { if (command_data->command == A_CLSE) side_id = command_data->arg1; /* OUT: local id */ else side_id = command_data->arg0; /* OUT: local id */ - else - if (command_data->command == A_OKAY) { - side_id = command_data->arg1; /* IN: remote id */ - } else + } else { side_id = command_data->arg1; /* IN: remote id */ + } key[3].length = 1; key[3].key = &side_id; |