Rename a couple of to_str functions to have ep_ in the name. This makes it

obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).

svn path=/trunk/; revision=54249

7 files changed, 10 insertions, 10 deletions

diff --git a/asn1/ansi_tcap/ansi_tcap.cnf b/asn1/ansi_tcap/ansi_tcap.cnf
index a013a6e6ef..5d9591a133 100644
--- a/asn1/ansi_tcap/ansi_tcap.cnf
+++ b/asn1/ansi_tcap/ansi_tcap.cnf
@@ -166,9 +166,9 @@ if(next_tvb) {
 		 * in the 8 octets case.
 		 */
 		if (len > 4){
-			ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(next_tvb, 4,len-4);
+			ansi_tcap_private.TransactionID_str = tvb_bytes_to_ep_str(next_tvb, 4,len-4);
 		}else{
-			ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(next_tvb, 0,len);
+			ansi_tcap_private.TransactionID_str = tvb_bytes_to_ep_str(next_tvb, 0,len);
 		}
 	}
 	switch(len) {
diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c
index e395a4816a..38b6695738 100644
--- a/asn1/c1222/packet-c1222-template.c
+++ b/asn1/c1222/packet-c1222-template.c
@@ -450,7 +450,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm
         proto_tree_add_uint(tree, hf_c1222_auth_len, tvb, *offset, 1, auth_len);
         *offset += 1;
         if (*length >= auth_len) {
-          auth_req = tvb_bytes_to_str(tvb, *offset, auth_len);
+          auth_req = tvb_bytes_to_ep_str(tvb, *offset, auth_len);
           proto_tree_add_item(tree, hf_c1222_auth_data, tvb, *offset, auth_len, ENC_NA);
           *offset += auth_len;
           *length -= auth_len + 1;
diff --git a/asn1/h248/h248.cnf b/asn1/h248/h248.cnf
index 3f068f39e3..e445a30c95 100644
--- a/asn1/h248/h248.cnf
+++ b/asn1/h248/h248.cnf
@@ -340,7 +340,7 @@ AuditReplyV1/auditResult	audit_result
 
 		if (curr_info.term->len) {
 			curr_info.term->buffer = (guint8 *)tvb_memdup(wmem_packet_scope(),new_tvb,0,curr_info.term->len);
-			curr_info.term->str = bytes_to_str(curr_info.term->buffer,curr_info.term->len);
+			curr_info.term->str = bytes_to_ep_str(curr_info.term->buffer,curr_info.term->len);
 		}
 
 		curr_info.term = gcp_cmd_add_term(curr_info.msg, curr_info.trx, curr_info.cmd, curr_info.term, wild_term, keep_persistent_data);
@@ -395,7 +395,7 @@ AuditReplyV1/auditResult	audit_result
 				/* not ascii or NULL character so do string as hex string */
 				proto_tree_add_text(tree, tvb, offset, len,"%s: 0x%s", 
 					(proto_registrar_get_nth(hf_index))->name,
-					tvb_bytes_to_str(tvb, 0, len));
+					tvb_bytes_to_ep_str(tvb, 0, len));
 				return len;
 			};
 		};
diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c
index 51559f4817..b1a8e23b90 100644
--- a/asn1/q932/packet-q932-template.c
+++ b/asn1/q932/packet-q932-template.c
@@ -232,7 +232,7 @@ dissect_q932_ni_ie(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree
   proto_tree_add_uint(tree, hf_q932_nd, tvb, offset - (length - remain), length - remain, value);
 
   if (remain > 0) {
-    proto_tree_add_text(tree, tvb, offset - remain, remain, "ASN.1 Encoded Data Structure(NOT IMPLEMENTED): %s", tvb_bytes_to_str(tvb, offset - remain, remain));
+    proto_tree_add_text(tree, tvb, offset - remain, remain, "ASN.1 Encoded Data Structure(NOT IMPLEMENTED): %s", tvb_bytes_to_ep_str(tvb, offset - remain, remain));
   }
 }
 
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf
index 33e3900a77..337e89bb96 100644
--- a/asn1/ranap/ranap.cnf
+++ b/asn1/ranap/ranap.cnf
@@ -204,7 +204,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 		guint8* bytes = (guint8 *)tvb_memdup(wmem_packet_scope(),imsi_tvb,0,len);
 
 		actx->pinfo->sccp_info->data.co.assoc->calling_party =
-			wmem_strdup_printf(wmem_file_scope(), "IMSI: %%s", bytes_to_str(bytes, len) );
+			wmem_strdup_printf(wmem_file_scope(), "IMSI: %%s", bytes_to_ep_str(bytes, len) );
 	}
 	digit_str = unpack_digits(imsi_tvb, 0);
 	proto_tree_add_string(tree, hf_ranap_imsi_digits, imsi_tvb, 0, -1, digit_str);
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index a07157dfe6..2f09a95e04 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -1157,7 +1157,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
       /* 12-byte AgentID w/ 8-byte trailer */
       if (len_remain==8) {
 	proto_tree_add_text(tree, tvb, offset, 8, "AgentID Trailer: 0x%s",
-			    tvb_bytes_to_str(tvb, offset, 8));
+			    tvb_bytes_to_ep_str(tvb, offset, 8));
 	offset+=8;
 	len_remain-=8;
       } else {
diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf
index 67585a1697..f132208573 100644
--- a/asn1/t38/t38.cnf
+++ b/asn1/t38/t38.cnf
@@ -162,11 +162,11 @@ VAL_PTR=&Data_Field_field_type_value
     if (primary_part){
         if(value_len < 8){
             col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]",
-               tvb_bytes_to_str(value_tvb,0,value_len));
+               tvb_bytes_to_ep_str(value_tvb,0,value_len));
         }
         else {
             col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s...]",
-               tvb_bytes_to_str(value_tvb,0,7));
+               tvb_bytes_to_ep_str(value_tvb,0,7));
         }
     }