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

1 files changed, 14 insertions, 14 deletions

diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c
index baf78ffb47..c52fbd65ef 100644
--- a/epan/dissectors/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
@@ -488,7 +488,7 @@ dissect_q933_bearer_capability_ie(tvbuff_t *tvb, int offset, int len,
 		 */
 		proto_tree_add_text(tree, tvb, offset,
 		    len, "Data: %s",
-		    tvb_bytes_to_str(tvb, offset, len));
+		    tvb_bytes_to_ep_str(tvb, offset, len));
 		proto_tree_add_uint(tree, hf_q933_coding_standard, tvb, offset, 1, octet);
 		proto_tree_add_boolean(tree, hf_q933_extension_ind, tvb, offset, 1, octet);
 		return;
@@ -910,7 +910,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len,
 		proto_tree_add_uint(tree, hf_q933_coding_standard, tvb, offset, 1, octet);
 		proto_tree_add_text(tree, tvb, offset,
 		    len, "Data: %s",
-		    tvb_bytes_to_str(tvb, offset, len));
+		    tvb_bytes_to_ep_str(tvb, offset, len));
 		return;
 	}
 	proto_tree_add_uint(tree, hf_q933_cause_location, tvb, offset, 1, octet);
@@ -981,7 +981,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len,
 		case Q933_REJ_USER_SPECIFIC:
 			proto_tree_add_text(tree, tvb, offset, len,
 			    "User specific diagnostic: %s",
-			    tvb_bytes_to_str(tvb, offset, len));
+			    tvb_bytes_to_ep_str(tvb, offset, len));
 			break;
 
 		case Q933_REJ_IE_MISSING:
@@ -1001,7 +1001,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len,
 		default:
 			proto_tree_add_text(tree, tvb, offset, len,
 			    "Diagnostic: %s",
-			    tvb_bytes_to_str(tvb, offset, len));
+			    tvb_bytes_to_ep_str(tvb, offset, len));
 			break;
 		}
 		break;
@@ -1039,7 +1039,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len,
 	default:
 		proto_tree_add_text(tree, tvb, offset, len,
 		    "Diagnostics: %s",
-		    tvb_bytes_to_str(tvb, offset, len));
+		    tvb_bytes_to_ep_str(tvb, offset, len));
 	}
 }
 
@@ -1088,7 +1088,7 @@ dissect_q933_call_state_ie(tvbuff_t *tvb, int offset, int len,
 		 */
 		proto_tree_add_text(tree, tvb, offset,
 		    len, "Data: %s",
-		    tvb_bytes_to_str(tvb, offset, len));
+		    tvb_bytes_to_ep_str(tvb, offset, len));
 		return;
 	}
 	proto_tree_add_text(tree, tvb, offset, 1,
@@ -1272,7 +1272,7 @@ dissect_q933_channel_identification_ie(tvbuff_t *tvb, int offset, int len,
 		if (identifier_len != 0) {
 			proto_tree_add_text(tree, tvb, identifier_offset,
 			    identifier_len, "Interface identifier: %s",
-			    tvb_bytes_to_str(tvb, identifier_offset, identifier_len));
+			    tvb_bytes_to_ep_str(tvb, identifier_offset, identifier_len));
 		}
 	}
 
@@ -1290,7 +1290,7 @@ dissect_q933_channel_identification_ie(tvbuff_t *tvb, int offset, int len,
 			 */
 			proto_tree_add_text(tree, tvb, offset,
 			    len, "Data: %s",
-			    tvb_bytes_to_str(tvb, offset, len));
+			    tvb_bytes_to_ep_str(tvb, offset, len));
 			return;
 		}
 		proto_tree_add_text(tree, tvb, offset, 1,
@@ -1340,7 +1340,7 @@ dissect_q933_progress_indicator_ie(tvbuff_t *tvb, int offset, int len,
 		 */
 		proto_tree_add_text(tree, tvb, offset,
 		    len, "Data: %s",
-		    tvb_bytes_to_str(tvb, offset, len));
+		    tvb_bytes_to_ep_str(tvb, offset, len));
 		return;
 	}
 	proto_tree_add_text(tree, tvb, offset, 1,
@@ -1430,7 +1430,7 @@ dissect_q933_ns_facilities_ie(tvbuff_t *tvb, int offset, int len,
 	 	return;
 	proto_tree_add_text(tree, tvb, offset,
 	    len, "Network-specific facility specification: %s",
-	    tvb_bytes_to_str(tvb, offset, len));
+	    tvb_bytes_to_ep_str(tvb, offset, len));
 }
 
 static int
@@ -1724,7 +1724,7 @@ dissect_q933_party_subaddr_ie(tvbuff_t *tvb, int offset, int len,
 	if (len == 0)
 		return;
 	proto_tree_add_text(tree, tvb, offset, len, "Subaddress: %s",
-	    tvb_bytes_to_str(tvb, offset, len));
+	    tvb_bytes_to_ep_str(tvb, offset, len));
 }
 
 /*
@@ -1781,7 +1781,7 @@ dissect_q933_high_layer_compat_ie(tvbuff_t *tvb, int offset, int len,
 		 */
 		proto_tree_add_text(tree, tvb, offset,
 		    len, "Data: %s",
-		    tvb_bytes_to_str(tvb, offset, len));
+		    tvb_bytes_to_ep_str(tvb, offset, len));
 		return;
 	}
 
@@ -1861,7 +1861,7 @@ dissect_q933_user_user_ie(tvbuff_t *tvb, int offset, int len,
 
 	default:
 		proto_tree_add_text(tree, tvb, offset, len, "User information: %s",
-		    tvb_bytes_to_str(tvb, offset, len));
+		    tvb_bytes_to_ep_str(tvb, offset, len));
 		break;
 	}
 }
@@ -2152,7 +2152,7 @@ dissect_q933(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				proto_tree_add_text(ie_tree, tvb,
 				    offset + 2, info_element_len,
 				    "Data: %s",
-				    tvb_bytes_to_str(tvb, offset + 2,
+				    tvb_bytes_to_ep_str(tvb, offset + 2,
 					  info_element_len));
 				break;
 			}