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

diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c
index e992b1af0d..5b88b27d2c 100644
--- a/epan/dissectors/packet-icq.c
+++ b/epan/dissectors/packet-icq.c
@@ -442,7 +442,7 @@ proto_add_icq_attr(proto_tree* tree, /* The tree to add to */
 		return -1;	/* length goes past end of packet */
 	proto_tree_add_text(tree, tvb, offset, len+2,
 			"%s[%u]: %.*s", descr, len, len,
-			tvb_get_ephemeral_string(tvb, offset + 2, len));
+			tvb_get_string(wmem_packet_scope(), tvb, offset + 2, len));
 	return len + 2;
 }
 
@@ -516,7 +516,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size,
 		break;
 	case MSG_TEXT:
 		proto_tree_add_text(subtree, tvb, offset, left, "Msg: %.*s", left-1,
-					tvb_get_ephemeral_string(tvb, offset, left));
+					tvb_get_string(wmem_packet_scope(), tvb, offset, left));
 		break;
 	case MSG_URL:
 		for (n = 0; n < N_URL_FIELDS; n++) {
@@ -530,7 +530,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size,
 				proto_tree_add_text(subtree, tvb, offset, sz, "%s: %.*s",
 							url_field_descr[n],
 							sz - 1,
-							tvb_get_ephemeral_string(tvb, offset, sz));
+							tvb_get_string(wmem_packet_scope(), tvb, offset, sz));
 			} else {
 				proto_tree_add_text(subtree, tvb, offset, 0,
 							"%s: %s", url_field_descr[n], "(empty)");
@@ -551,7 +551,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size,
 			proto_tree_add_text(subtree, tvb, offset, sz, "%s: %.*s",
 						email_field_descr[n],
 						sz - 1,
-						tvb_get_ephemeral_string(tvb, offset, sz));
+						tvb_get_string(wmem_packet_scope(), tvb, offset, sz));
 		} else {
 			proto_tree_add_text(subtree, tvb, offset, 0, "%s: %s",
 						email_field_descr[n], "(empty)");
@@ -586,7 +586,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size,
 			if (sz != 0) {
 				proto_tree_add_text(subtree, tvb, offset, sz, "%s: %.*s",
 							auth_req_field_descr[n], sz - 1,
-							tvb_get_ephemeral_string(tvb, offset, sz));
+							tvb_get_string(wmem_packet_scope(), tvb, offset, sz));
 			} else {
 				proto_tree_add_text(subtree, tvb, offset, 0, "%s: %s",
 							auth_req_field_descr[n], "(empty)");
@@ -606,7 +606,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size,
 		if (sz != 0) {
 			proto_tree_add_text(subtree, tvb, offset, sz, "%s: %.*s",
 						user_added_field_descr[n], sz - 1,
-						tvb_get_ephemeral_string(tvb, offset, sz));
+						tvb_get_string(wmem_packet_scope(), tvb, offset, sz));
 		} else {
 			proto_tree_add_text(subtree, tvb, offset, 0, "%s: %s",
 						user_added_field_descr[n], "(empty)");
@@ -636,7 +636,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size,
 				/* The first element is the number of Nick/UIN pairs follow */
 				proto_tree_add_text(subtree, tvb, offset, sz_local,
 							"Number of pairs: %.*s", sz_local - 1,
-							tvb_get_ephemeral_string(tvb, offset, sz_local));
+							tvb_get_string(wmem_packet_scope(), tvb, offset, sz_local));
 				n_local++;
 			} else if (!last) {
 				int svsz = sz_local;
@@ -652,8 +652,8 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size,
 				}
 				proto_tree_add_text(subtree, tvb, offset, sz_local + svsz,
 							"%.*s: %.*s", svsz - 1,
-							tvb_get_ephemeral_string(tvb, offset, svsz), sz_local - 1,
-							tvb_get_ephemeral_string(tvb, sep_offset_prev + 1, sz_local));
+							tvb_get_string(wmem_packet_scope(), tvb, offset, svsz), sz_local - 1,
+							tvb_get_string(wmem_packet_scope(), tvb, sep_offset_prev + 1, sz_local));
 				n_local += 2;
 			}
 
@@ -686,7 +686,7 @@ icqv5_cmd_send_text_code(proto_tree* tree, /* Tree to put the data in */
 	if (len>0) {
 		proto_tree_add_text(subtree, tvb, offset + CMD_SEND_TEXT_CODE_TEXT,
 				len, "Text: %.*s", len,
-				tvb_get_ephemeral_string(tvb, offset + CMD_SEND_TEXT_CODE_TEXT,
+				tvb_get_string(wmem_packet_scope(), tvb, offset + CMD_SEND_TEXT_CODE_TEXT,
 						len));
 	}
 
@@ -729,7 +729,7 @@ icqv5_cmd_login(proto_tree* tree, tvbuff_t *tvb, int offset)
 		passwdLen = tvb_get_letohs(tvb, offset + CMD_LOGIN_PASSLEN);
 		proto_tree_add_text(subtree, tvb, offset + CMD_LOGIN_PASSLEN,
 					2 + passwdLen, "Passwd: %.*s", (int)passwdLen,
-					tvb_get_ephemeral_string(tvb, offset + CMD_LOGIN_PASSWD,
+					tvb_get_string(wmem_packet_scope(), tvb, offset + CMD_LOGIN_PASSWD,
 						passwdLen));
 		proto_tree_add_text(subtree, tvb,
 					offset + CMD_LOGIN_PASSWD + passwdLen + CMD_LOGIN_IP,
@@ -914,7 +914,7 @@ icqv5_srv_meta_user(proto_tree* tree, /* Tree to put the data in */
 		offset+=2;
 		proto_tree_add_text(sstree, tvb, offset - 2,
 				len+2, "About(%d): %.*s", len,
-				len, tvb_get_ephemeral_string(tvb, offset, len));
+				len, tvb_get_string(wmem_packet_scope(), tvb, offset, len));
 		break;
 	}
 	case META_USER_INFO:
@@ -1106,7 +1106,7 @@ dissect_icqv5Client(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	 * bytes in the buffer.
 	 */
 	rounded_size = ((((capturedsize - ICQ5_CL_SESSIONID) + 3)/4)*4) + ICQ5_CL_SESSIONID;
-	/* rounded_size might exceed the tvb bounds so we can't just use tvb_g_memdup here. */
+	/* rounded_size might exceed the tvb bounds so we can't just use tvb_memdup here. */
 	decr_pd = (guint8 *)g_malloc(rounded_size);
 	tvb_memcpy(tvb, decr_pd, 0, capturedsize);
 	decrypt_v5(decr_pd, rounded_size, key);