diff options
| author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:30:58 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:13:58 +0000 |
| commit | 971ffd683ea23362bd8009567ff7860371e6e2cc (patch) | |
| tree | 28c9ada98d2e59b196fc839d39ab2448fd436968 /epan/dissectors/packet-dbus.c | |
| parent | 421d817d70737ebd459b7027274bf38bb2d9a2ff (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-dbus.c')
| -rw-r--r-- | epan/dissectors/packet-dbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c index 6d320fc237..36edd41769 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.c @@ -309,7 +309,7 @@ dissect_dbus_sig(tvbuff_t *tvb, dbus_info_t *dinfo, proto_tree *tree, int offset len = dinfo->get32(tvb, offset); offset += 4; - val = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + val = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); offset += (len + 1 /* NUL-byte */ + 3) & ~3; if (sig == 's') { @@ -337,7 +337,7 @@ dissect_dbus_sig(tvbuff_t *tvb, dbus_info_t *dinfo, proto_tree *tree, int offset len = tvb_get_guint8(tvb, offset); offset += 1; - val = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + val = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); offset += (len + 1); ti = proto_tree_add_string_format(tree, hfi_dbus_value_str.id, tvb, org_offset, offset - org_offset, val, "SIGNATURE: %s", val); @@ -368,7 +368,7 @@ dissect_dbus_field_signature(tvbuff_t *tvb, dbus_info_t *dinfo, proto_tree *tree /* sig_len = tvb_strsize(tvb, offset); */ - sig = tvb_get_string(wmem_packet_scope(), tvb, offset, sig_len); + sig = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, sig_len, ENC_ASCII); offset += (sig_len + 1); ti = proto_tree_add_string(tree, &hfi_dbus_type_signature, tvb, org_offset, offset - org_offset, sig); |