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

1 files changed, 3 insertions, 3 deletions

diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index 5ff360e09a..268e2827b6 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -265,7 +265,7 @@ static int display_address(tvbuff_t *tvb, int offset, proto_tree *tree) {
 		gchar* str;
 
 		len = tvb_get_guint8(tvb, offset);
-		str = tvb_get_ephemeral_string(tvb, offset+1, len);
+		str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len);
 		proto_tree_add_string(tree, hf_socks_remote_name, tvb, offset, len+1, str);
 		offset += (len+1);
 		}
@@ -566,12 +566,12 @@ client_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		case USER_NAME_AUTHENTICATION:
 			/* process user name */
 			len = tvb_get_guint8(tvb, offset);
-			str = tvb_get_ephemeral_string(tvb, offset+1, len);
+			str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len);
 			proto_tree_add_string(tree, hf_socks_username, tvb, offset, len+1, str);
 			offset += (len+1);
 
 			len = tvb_get_guint8(tvb, offset);
-			str = tvb_get_ephemeral_string(tvb, offset+1, len);
+			str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len);
 			proto_tree_add_string(tree, hf_socks_password, tvb, offset, len+1, str);
 			/* offset += (len+1); */
 			break;