diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-05 16:20:15 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-03-06 09:54:01 +0000 |
| commit | 576043944b54df469d00e929e48256697075d9b1 (patch) | |
| tree | 547cd006449cb607fe97d5b124545197dceb2d6f /epan | |
| parent | e9f6174c26b861f16c99d7e9d8d913e5572fed1e (diff) | |
| download | wireshark-576043944b54df469d00e929e48256697075d9b1.tar.gz | |
bluetooth: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7
Change-Id: I4d8e6f32b08991f49ee22b320f02c1f65e22b6a0
Reviewed-on: https://code.wireshark.org/review/20400
Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-btatt.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-bthci_cmd.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-bthid.c | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index a2846b0d8b..087b2fd605 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -3662,7 +3662,7 @@ get_request(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint8 opcode, if (tvb_captured_length_remaining(tvb, offset) < 1) return NULL; opcode = tvb_get_guint8(tvb, 1) + 1; - /* No break */ + /* FALL THROUGH */ case 0x03: /* Exchange MTU Response */ case 0x05: /* Find Information Response */ case 0x07: /* Find By Type Value Response */ @@ -3695,7 +3695,7 @@ get_request(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint8 opcode, if (tvb_captured_length_remaining(tvb, offset) < 1) return NULL; opcode = tvb_get_guint8(tvb, 1) + 1; - /* No break */ + /* FALL THROUGH */ case 0x03: /* Exchange MTU Response */ case 0x05: /* Find Information Response */ case 0x07: /* Find By Type Value Response */ diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index b18d2414f4..858fca079b 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -2486,7 +2486,7 @@ dissect_link_policy_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre case 0x000d: /* Write Link Policy Settings */ proto_tree_add_item(tree, hf_bthci_cmd_connection_handle, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - /* deliberately fall through */ + /* FALL THROUGH */ case 0x000f: /* Write Default Link Policy Settings */ proto_tree_add_item(tree, hf_bthci_cmd_link_policy_setting_switch, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_bthci_cmd_link_policy_setting_hold , tvb, offset, 2, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c index 460cfb4b57..2a1e7b9d5a 100644 --- a/epan/dissectors/packet-bthid.c +++ b/epan/dissectors/packet-bthid.c @@ -290,6 +290,7 @@ dissect_bthid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U case 0x0B: /* DATC */ if (show_deprecated) expert_add_info(pinfo, pitem, &ei_bthid_transaction_type_deprecated); + /* FALL THROUGH */ case 0x0A: /* DATA */ proto_tree_add_item(bthid_tree, hf_bthid_parameter_reserved_32, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(bthid_tree, hf_bthid_parameter_report_type, tvb, offset, 1, ENC_BIG_ENDIAN); |