diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2016-01-21 09:23:42 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-02-05 18:57:29 +0000 |
| commit | c09d894f7446aa394d04710876ed631af22b1497 (patch) | |
| tree | dd17ff934afd6f386f8149d4869c6209bf60174b /epan/dissectors/packet-btle.c | |
| parent | fb033d0f39eda3f3937ae265c422ad907b179f42 (diff) | |
Fix some Coverity issue
>>> CID 1349726: Incorrect expression (COPY_PASTE_ERROR)
>>> "tvb_reported_length_remaining" in "tvb_reported_length_remaining(tvb, offset)" looks like a copy-paste error.
>>> CID 1349727: Incorrect expression (COPY_PASTE_ERROR)
>>> "tree" in "dissector_try_uint_new(bluetooth_eir_ad_manufacturer_company_id, company_id, new_tvb, pinfo,
>>> CID 1349728: (DEADCODE)
>>> Execution cannot reach this expression "0" inside statement "(0 && ((__s1_len = __builti...".
>>> CID 1306904: Logically dead code (DEADCODE)
>>> Execution cannot reach this statement "tap_hci_summary->interface_...".
Change-Id: I5f99e37e6d5fac39da7082649caa8373d06bb808
Reviewed-on: https://code.wireshark.org/review/13739
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-btle.c')
| -rw-r--r-- | epan/dissectors/packet-btle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index 5a48b143d4..f79749a015 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -389,10 +389,10 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) else interface_id = HCI_INTERFACE_DEFAULT; - if (bluetooth_data) - adapter_id = bluetooth_data->adapter_id; - else if (ubertooth_data) + if (ubertooth_data) adapter_id = ubertooth_data->bus_id << 8 | ubertooth_data->device_address; + else if (bluetooth_data) + adapter_id = bluetooth_data->adapter_id; else adapter_id = HCI_ADAPTER_DEFAULT; |