Apparently one of our major global headers must include emem.h, because I just

found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.

svn path=/trunk/; revision=50066

1 files changed, 16 insertions, 16 deletions

diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf
index 6394a73ba2..6235b8e513 100644
--- a/asn1/ldap/ldap.cnf
+++ b/asn1/ldap/ldap.cnf
@@ -387,7 +387,7 @@ ldap_conv_info_t *ldap_info;
 	Filter_string=ldapstring;
      } else if (hf_index == hf_ldap_type) {
 	/* remember attribute type name */
-	attr_type = ep_strdup(ldapstring);
+	attr_type = wmem_strdup(wmem_packet_scope(), ldapstring);
 
 	/* append it to the parent entry */
 	proto_item_append_text(tree, " %%s", attr_type);
@@ -536,31 +536,31 @@ ldap_conv_info_t *ldap_info;
 	Filter_length = 0;
 
 #.FN_FTR Filter/equalityMatch
-	Filter_string=ep_strdup_printf("(%s=%s)",
+	Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s=%s)",
 				       string_or_null(attributedesc_string),
 				       string_or_null(ldapvalue_string));
 
 
 #.FN_FTR Filter/greaterOrEqual
-	Filter_string=ep_strdup_printf("(%s>=%s)",
+	Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s>=%s)",
 				       string_or_null(attributedesc_string),
 				       string_or_null(ldapvalue_string));
 
 
 #.FN_FTR Filter/lessOrEqual
-	Filter_string=ep_strdup_printf("(%s<=%s)",
+	Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s<=%s)",
 				       string_or_null(attributedesc_string),
 				       string_or_null(ldapvalue_string));
 
 
 #.FN_FTR Filter/approxMatch
-	Filter_string=ep_strdup_printf("(%s~=%s)",
+	Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s~=%s)",
 				       string_or_null(attributedesc_string),
 				       string_or_null(ldapvalue_string));
 
 #.FN_FTR Filter/and/_item
 	if(and_filter_string){
-		and_filter_string=ep_strdup_printf("(&%s%s)",and_filter_string,Filter_string);
+		and_filter_string=wmem_strdup_printf(wmem_packet_scope(), "(&%s%s)",and_filter_string,Filter_string);
 	} else {
 		and_filter_string=Filter_string;
 	}
@@ -581,13 +581,13 @@ ldap_conv_info_t *ldap_info;
 
 	if(and_filter_string) {
 		proto_item_append_text(it, "%%s", and_filter_string);
-		Filter_string=ep_strdup_printf("%%s",and_filter_string);
+		Filter_string=wmem_strdup_printf(wmem_packet_scope(), "%%s",and_filter_string);
 	}
 	and_filter_string=old_and_filter_string;
 
 #.FN_FTR Filter/or/_item
 	if(or_filter_string){
-		or_filter_string=ep_strdup_printf("(|%s%s)",or_filter_string,Filter_string);
+		or_filter_string=wmem_strdup_printf(wmem_packet_scope(), "(|%s%s)",or_filter_string,Filter_string);
 	} else {
 		or_filter_string=Filter_string;
 	}
@@ -607,15 +607,15 @@ ldap_conv_info_t *ldap_info;
 %(DEFAULT_BODY)s
 	if(or_filter_string) {
 		proto_item_append_text(it, "%%s", or_filter_string);
-		Filter_string=ep_strdup_printf("%%s",or_filter_string);
+		Filter_string=wmem_strdup_printf(wmem_packet_scope(), "%%s",or_filter_string);
 	}
 	or_filter_string=old_or_filter_string;
 
 #.FN_FTR Filter/present
-	Filter_string=ep_strdup_printf("(%s=*)",string_or_null(Filter_string));
+	Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s=*)",string_or_null(Filter_string));
 
 #.FN_FTR Filter/not
-	Filter_string=ep_strdup_printf("(!%s)",string_or_null(Filter_string));
+	Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(!%s)",string_or_null(Filter_string));
 
 #.FN_BODY MatchingRuleAssertion/dnAttributes
 	gboolean val;
@@ -633,7 +633,7 @@ offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &v
 	matching_rule_dnattr=FALSE;
 
 #.FN_FTR Filter/extensibleMatch
-	Filter_string=ep_strdup_printf("(%s:%s%s%s=%s)",
+	Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%s:%s%s%s=%s)",
 					(attr_type?attr_type:""),
 					(matching_rule_dnattr?"dn:":""),
 					(matching_rule_string?matching_rule_string:""),
@@ -642,15 +642,15 @@ offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &v
 
 #.FN_FTR SubstringFilter/substrings/_item
 	if (substring_item_final) {
-		substring_value=ep_strdup_printf("%s%s",
+		substring_value=wmem_strdup_printf(wmem_packet_scope(), "%s%s",
 						 (substring_value?substring_value:"*"),
 						 substring_item_final);
 	} else if (substring_item_any) {
-		substring_value=ep_strdup_printf("%s%s*",
+		substring_value=wmem_strdup_printf(wmem_packet_scope(), "%s%s*",
 						 (substring_value?substring_value:"*"),
 						 substring_item_any);
 	} else if (substring_item_init) {
-		substring_value=ep_strdup_printf("%s*",
+		substring_value=wmem_strdup_printf(wmem_packet_scope(), "%s*",
 						 substring_item_init);
 	}
 
@@ -670,7 +670,7 @@ offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &v
 		tree = tr;
 	}
 %(DEFAULT_BODY)s
-	Filter_string=ep_strdup_printf("(%%s=%%s)",
+	Filter_string=wmem_strdup_printf(wmem_packet_scope(), "(%%s=%%s)",
 		string_or_null(attr_type),
 		string_or_null(substring_value));
 	proto_item_append_text(it, "%%s", Filter_string);