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-slsk.c | |
| parent | c4a608a94071f4a23eaf16fd3ab9545e26309f76 (diff) | |
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-slsk.c')
| -rw-r--r-- | epan/dissectors/packet-slsk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 4bb7ba49fa..86510b60f6 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -969,7 +969,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset += 4+len; len = tvb_get_letohl(tvb, offset); proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len); - str = tvb_get_ephemeral_string(tvb, offset+4, len); + str = tvb_get_string(wmem_packet_scope(), tvb, offset+4, len); proto_tree_add_string_format(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "Connection Type: %s (Char: %s)", connection_type(str), format_text(str, len)); @@ -989,7 +989,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset += 4+len; len = tvb_get_letohl(tvb, offset); proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len); - str = tvb_get_ephemeral_string(tvb, offset+4, len); + str = tvb_get_string(wmem_packet_scope(), tvb, offset+4, len); proto_tree_add_string_format(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "Connection Type: %s (Char: %s)", connection_type(str), format_text(str, len)); @@ -2346,7 +2346,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset += 4+len; len = tvb_get_letohl(tvb, offset); proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len); - str = tvb_get_ephemeral_string(tvb, offset+4, len); + str = tvb_get_string(wmem_packet_scope(), tvb, offset+4, len); proto_tree_add_string_format(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "Connection Type: %s (Char: %s)", connection_type(str), format_text(str, len)); |