Now that the test suite is done and most of the common functions are

implemented, start replacing emem with wmem in dissectors.

Also remove emem.h include from a few files that didn't actually need it.

More to come once in hopefully large batches once I figure out the
appropriate regexes.

svn path=/trunk/; revision=49009

1 files changed, 16 insertions, 16 deletions

diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c
index 3983890260..2618412ff3 100644
--- a/epan/dissectors/packet-adwin.c
+++ b/epan/dissectors/packet-adwin.c
@@ -30,7 +30,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 
 /* Forward declarations */
 void proto_register_adwin(void);
@@ -575,7 +575,7 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo,
 	}
 	if (!adwin_trans) {
 		/* create a "fake" adwin_trans structure */
-		adwin_trans = ep_new(adwin_transaction_t);
+		adwin_trans = wmem_new(wmem_packet_scope(), adwin_transaction_t);
 		adwin_trans->req_frame = 0;
 		adwin_trans->rep_frame = 0;
 		adwin_trans->req_time = pinfo->fd->abs_ts;
@@ -615,14 +615,14 @@ dissect_UDPH1_generic(tvbuff_t *tvb, packet_info *pinfo,
 	guint32 i3plus1code =  0, instructionID, seq_num;
 
 	instructionID = tvb_get_letohl(tvb, 0);
-	*info_string = ep_strdup_printf("%s: %s", packet_name,
+	*info_string = wmem_strdup_printf(wmem_packet_scope(), "%s: %s", packet_name,
 				        val_to_str_ext(instructionID, &instruction_mapping_ext, "unknown instruction: %d"));
 
 	if (instructionID == I_3PLUS1) {
 		gchar *tmp = *info_string;
 
 		i3plus1code = tvb_get_letohl(tvb, 20);
-		*info_string = ep_strdup_printf("%s: %s", tmp, val_to_str_ext(i3plus1code, &instruction_3plus1_mapping_ext, "unknown 3+1 code: %d"));
+		*info_string = wmem_strdup_printf(wmem_packet_scope(), "%s: %s", tmp, val_to_str_ext(i3plus1code, &instruction_3plus1_mapping_ext, "unknown 3+1 code: %d"));
 	}
 
 	/* Get the transaction identifier */
@@ -795,7 +795,7 @@ dissect_UDPH1_new(tvbuff_t *tvb, packet_info *pinfo,
 
 	SET_PACKET_TYPE(adwin_tree, APT_UDPH1_new);
 	dll_i = tvb_get_letohl(tvb, 52);
-	dll_version_s = ep_strdup_printf("%d.%d.%d",
+	dll_version_s = wmem_strdup_printf(wmem_packet_scope(), "%d.%d.%d",
 					dll_i / 1000000,
 					(dll_i - dll_i / 1000000 * 1000000) / 1000,
 					dll_i % 1000);
@@ -815,9 +815,9 @@ dissect_UDPR1(tvbuff_t *tvb, packet_info *pinfo,
 	status = tvb_get_letohl(tvb, 0);
 	status_string = try_val_to_str_ext(status, &error_code_mapping_ext);
 	if (status_string) {
-		*info_string = ep_strdup_printf("UDPR1 Status: %s", status_string);
+		*info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR1 Status: %s", status_string);
 	} else {
-		*info_string = ep_strdup_printf("UDPR1 Undefined error code %d", status);
+		*info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR1 Undefined error code %d", status);
 	}
 
 	/* Get the transaction identifier */
@@ -849,9 +849,9 @@ dissect_UDPR2(tvbuff_t *tvb, packet_info *pinfo,
 	status = tvb_get_letohl(tvb, 0);
 	status_string = try_val_to_str_ext(status, &error_code_mapping_ext);
 	if (status_string) {
-	        *info_string = ep_strdup_printf("UDPR2 Status: %s", status_string);
+	        *info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR2 Status: %s", status_string);
 	} else {
-		*info_string = ep_strdup_printf("UDPR2 Undefined error code %d", status);
+		*info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR2 Undefined error code %d", status);
 	}
 
 	/* Get the transaction identifier */
@@ -936,9 +936,9 @@ dissect_UDPR4(tvbuff_t *tvb, packet_info *pinfo,
 	status = tvb_get_letohl(tvb, 0);
 	status_string = try_val_to_str_ext(status, &error_code_mapping_ext);
 	if (status_string) {
-		*info_string = ep_strdup_printf("UDPR4 Status: %s", status_string);
+		*info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR4 Status: %s", status_string);
 	} else {
-		*info_string = ep_strdup_printf("UDPR4 Undefined error code %d", status);
+		*info_string = wmem_strdup_printf(wmem_packet_scope(), "UDPR4 Undefined error code %d", status);
 	}
 
 	/* Get the transaction identifier */
@@ -1138,28 +1138,28 @@ dissect_adwin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U
 	case UDPH2_LENGTH: /* to the best of my knowledge, this struct
 			    * has never been used publically! */
 		/* dissect_UDPH2(tvb, pinfo, adwin_tree, adwin_debug_tree); */
-		info_string = ep_strdup("UDPH2 - UNUSED");
+		info_string = wmem_strdup(wmem_packet_scope(), "UDPH2 - UNUSED");
 		break;
 	case UDPR2_LENGTH:
 		dissect_UDPR2(tvb, pinfo, adwin_tree, adwin_debug_tree, &info_string);
 		break;
 	case UDPR3_LENGTH:
 		dissect_UDPR3(tvb, pinfo, adwin_tree, adwin_debug_tree);
-		info_string = ep_strdup("UDPR3");
+		info_string = wmem_strdup(wmem_packet_scope(), "UDPR3");
 		break;
 	case UDPR4_LENGTH:
 		dissect_UDPR4(tvb, pinfo, adwin_tree, adwin_debug_tree, &info_string);
 		break;
 	case GetDataSHPacket_LENGTH:
 		dissect_GDSHP(tvb, pinfo, adwin_tree, adwin_debug_tree);
-		info_string = ep_strdup("GDSHP");
+		info_string = wmem_strdup(wmem_packet_scope(), "GDSHP");
 		break;
 	case GetDataSHRequest_LENGTH:
 		dissect_GDSHR(tvb, pinfo, adwin_tree, adwin_debug_tree);
-		info_string = ep_strdup("GDSHR");
+		info_string = wmem_strdup(wmem_packet_scope(), "GDSHR");
 		break;
 	default:
-		info_string = ep_strdup_printf("Unknown ADwin packet, length: %d", length);
+		info_string = wmem_strdup_printf(wmem_packet_scope(), "Unknown ADwin packet, length: %d", length);
 		break;
 	}