diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
| commit | a0c53ffaa1bb46d8c9db2ec739401aa411c9790e (patch) | |
| tree | 56a11c9e0910032ad43476462dd2c95ed65e5cc1 /epan/dissectors/packet-dbus.c | |
| parent | c4a608a94071f4a23eaf16fd3ab9545e26309f76 (diff) | |
| download | wireshark-a0c53ffaa1bb46d8c9db2ec739401aa411c9790e.tar.gz | |
emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly
svn path=/trunk/; revision=52172
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 ae268e0add..cfc3b0e3b6 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.c @@ -311,7 +311,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_ephemeral_string(tvb, offset, len); + val = tvb_get_string(wmem_packet_scope(), tvb, offset, len); offset += (len + 1 /* NUL-byte */ + 3) & ~3; if (sig == 's') { @@ -339,7 +339,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_ephemeral_string(tvb, offset, len); + val = tvb_get_string(wmem_packet_scope(), tvb, offset, len); 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); @@ -370,7 +370,7 @@ dissect_dbus_field_signature(tvbuff_t *tvb, dbus_info_t *dinfo, proto_tree *tree /* sig_len = tvb_strsize(tvb, offset); */ - sig = tvb_get_ephemeral_string(tvb, offset, sig_len); + sig = tvb_get_string(wmem_packet_scope(), tvb, offset, sig_len); offset += (sig_len + 1); ti = proto_tree_add_string(tree, &hfi_dbus_type_signature, tvb, org_offset, offset - org_offset, sig); |