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-vnc.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-vnc.c')
| -rw-r--r-- | epan/dissectors/packet-vnc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index a9a6ea6a13..90c6a89b9c 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -890,7 +890,7 @@ process_vendor(proto_tree *tree, gint hfindex, tvbuff_t *tvb, gint offset) proto_item *ti; if (tree) { - vendor = tvb_get_ephemeral_string(tvb, offset, 4); + vendor = tvb_get_string(wmem_packet_scope(), tvb, offset, 4); ti = proto_tree_add_string(tree, hfindex, tvb, offset, 4, vendor); @@ -923,7 +923,7 @@ process_tight_capabilities(proto_tree *tree, offset = process_vendor(tree, vendor_index, tvb, offset); - name = tvb_get_ephemeral_string(tvb, offset, 8); + name = tvb_get_string(wmem_packet_scope(), tvb, offset, 8); proto_tree_add_string(tree, name_index, tvb, offset, 8, name); offset += 8; } @@ -1029,7 +1029,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree_add_item(tree, hf_vnc_server_proto_ver, tvb, 4, 7, ENC_ASCII|ENC_NA); per_conversation_info->server_proto_ver = - g_ascii_strtod((char *)tvb_get_ephemeral_string(tvb, 4, 7), NULL); + g_ascii_strtod((char *)tvb_get_string(wmem_packet_scope(), tvb, 4, 7), NULL); per_conversation_info->server_port = pinfo->srcport; col_add_fstr(pinfo->cinfo, COL_INFO, @@ -1046,7 +1046,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree_add_item(tree, hf_vnc_client_proto_ver, tvb, 4, 7, ENC_ASCII|ENC_NA); per_conversation_info->client_proto_ver = - g_ascii_strtod((char *)tvb_get_ephemeral_string(tvb, 4, 7), NULL); + g_ascii_strtod((char *)tvb_get_string(wmem_packet_scope(), tvb, 4, 7), NULL); col_add_fstr(pinfo->cinfo, COL_INFO, "Client protocol version: %s", @@ -1198,10 +1198,10 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, auth_code = tvb_get_ntohl(tvb, offset); auth_item = proto_tree_add_item(tree, hf_vnc_tight_auth_code, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - vendor = tvb_get_ephemeral_string(tvb, offset, 4); + vendor = tvb_get_string(wmem_packet_scope(), tvb, offset, 4); process_vendor(tree, hf_vnc_tight_server_vendor, tvb, offset); offset += 4; - signature = tvb_get_ephemeral_string(tvb, offset, 8); + signature = tvb_get_string(wmem_packet_scope(), tvb, offset, 8); proto_tree_add_text(tree, tvb, offset, 8, "Signature: %s", signature); offset += 8; |