aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-bthci_cmd.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2014-06-17 17:30:58 +0200
committerAnders Broman <a.broman58@gmail.com>2014-06-18 14:13:58 +0000
commit971ffd683ea23362bd8009567ff7860371e6e2cc (patch)
tree28c9ada98d2e59b196fc839d39ab2448fd436968 /epan/dissectors/packet-bthci_cmd.c
parent421d817d70737ebd459b7027274bf38bb2d9a2ff (diff)
Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe Reviewed-on: https://code.wireshark.org/review/2376 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-bthci_cmd.c')
-rw-r--r--epan/dissectors/packet-bthci_cmd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index 6a8655122d..d5de57d57d 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -1809,7 +1809,7 @@ save_local_device_name(tvbuff_t *tvb, gint offset, packet_info *pinfo,
switch(tvb_get_guint8(tvb, offset + i + 1)) {
case 0x08: /* Device Name, shortened */
case 0x09: /* Device Name, full */
- name = tvb_get_string(wmem_packet_scope(), tvb, offset + i + 2, length - 1);
+ name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + i + 2, length - 1, ENC_ASCII);
k_interface_id = hci_data->interface_id;
k_adapter_id = hci_data->adapter_id;
@@ -2574,7 +2574,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin
k_adapter_id = hci_data->adapter_id;
k_frame_number = pinfo->fd->num;
- name = tvb_get_string(wmem_packet_scope(), tvb, offset, 248);
+ name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 248, ENC_ASCII);
key[0].length = 1;
key[0].key = &k_interface_id;