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-rdp.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-rdp.c')
-rw-r--r-- | epan/dissectors/packet-rdp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index 5eac0edeee..5d3ea91ee8 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -842,7 +842,7 @@ dissect_rdp_fields(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr pi = proto_tree_add_item(tree, c->field, tvb, offset, len, ENC_LITTLE_ENDIAN); if (c->flags & RDP_FI_UNICODE) { - string = tvb_get_ephemeral_unicode_string(tvb, offset, len, ENC_LITTLE_ENDIAN); + string = tvb_get_unicode_string(wmem_packet_scope(), tvb, offset, len, ENC_LITTLE_ENDIAN); proto_item_append_text(pi, " (%s)", string); } @@ -957,7 +957,7 @@ dissect_rdp_clientNetworkData(tvbuff_t *tvb, int offset, packet_info *pinfo, pro for (i = 0; i < MIN(channelCount, MAX_CHANNELS); i++) { if (rdp_info) { rdp_info->channels[i].value = -1; /* unset */ - rdp_info->channels[i].strptr = tvb_get_ephemeral_string(tvb, offset, 8); + rdp_info->channels[i].strptr = tvb_get_string(wmem_packet_scope(), tvb, offset, 8); } offset = dissect_rdp_fields(tvb, offset, pinfo, next_tree, def_fields, 0); } |