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, 7 insertions, 7 deletions

diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c
index c0b24a7302..a2a2133d14 100644
--- a/epan/dissectors/packet-msproxy.c
+++ b/epan/dissectors/packet-msproxy.c
@@ -314,7 +314,7 @@ static int display_application_name(tvbuff_t *tvb, int offset,
 
 	length = tvb_strnlen( tvb, offset, 255);
 	proto_tree_add_text( tree, tvb, offset, length, "Application: %.*s",
-		length, tvb_get_ephemeral_string( tvb, offset, length));
+		length, tvb_get_string( wmem_packet_scope(),  tvb, offset, length));
 
 	return length;
 }
@@ -377,7 +377,7 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset,
 			return;
 		proto_tree_add_text( tree, tvb, offset, length + 1,
 			"User name: %.*s", length,
-			tvb_get_ephemeral_string( tvb, offset, length));
+			tvb_get_string( wmem_packet_scope(),  tvb, offset, length));
 		offset += length + 2;
 
 		length = tvb_strnlen( tvb, offset, 255);
@@ -385,7 +385,7 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset,
 			return;
 		proto_tree_add_text( tree, tvb, offset, length + 1,
 			"Application name: %.*s", length,
-			tvb_get_ephemeral_string( tvb, offset, length));
+			tvb_get_string( wmem_packet_scope(),  tvb, offset, length));
 		offset += length + 1;
 
 		length = tvb_strnlen( tvb, offset, 255);
@@ -393,7 +393,7 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset,
 			return;
 		proto_tree_add_text( tree, tvb, offset, length + 1,
 			"Client computer name: %.*s", length,
-			tvb_get_ephemeral_string( tvb, offset, length));
+			tvb_get_string( wmem_packet_scope(),  tvb, offset, length));
 	}
 }
 
@@ -582,7 +582,7 @@ static void dissect_request_resolve(tvbuff_t *tvb, int offset,
 	if ( tree){
   	 	ti = proto_tree_add_text(tree, tvb, offset, length + 1,
    		 	"Host Name: %.*s", length,
-   		 	tvb_get_ephemeral_string( tvb, offset + 18, length));
+   		 	tvb_get_string( wmem_packet_scope(),  tvb, offset + 18, length));
 
 		name_tree = proto_item_add_subtree(ti, ett_msproxy_name);
 
@@ -593,7 +593,7 @@ static void dissect_request_resolve(tvbuff_t *tvb, int offset,
 		offset += 17;
 
 		proto_tree_add_text( name_tree, tvb, offset, length, "String: %s",
-   		 	tvb_get_ephemeral_string( tvb, offset, length));
+   		 	tvb_get_string( wmem_packet_scope(),  tvb, offset, length));
 	}
 }
 
@@ -813,7 +813,7 @@ static void dissect_auth_1_ack(tvbuff_t *tvb, int offset,
 
 		/* XXX - always 255? */
 		proto_tree_add_text( tree, tvb, offset, 255, "NT domain: %.255s",
-			tvb_get_ephemeral_string( tvb, offset, 255));
+			tvb_get_string( wmem_packet_scope(),  tvb, offset, 255));
 	}
 }