From 971ffd683ea23362bd8009567ff7860371e6e2cc Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Tue, 17 Jun 2014 17:30:58 +0200 Subject: 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 --- epan/dissectors/packet-bthci_cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-bthci_cmd.c') 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; -- cgit v1.2.3