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

diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index be321fdbad..492b49e53d 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -316,7 +316,7 @@ decode_plain_auth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   gint                       length_pass;
   guint8                    *decrypt   = NULL;
 
-  decrypt = tvb_get_ephemeral_string(tvb, a_offset, a_linelen);
+  decrypt = tvb_get_string(wmem_packet_scope(), tvb, a_offset, a_linelen);
   if (stmp_decryption_enabled) {
     returncode = (gint)epan_base64_decode(decrypt);
     if (returncode) {
@@ -575,7 +575,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
           if ((session_state->auth_state != SMTP_AUTH_STATE_NONE) &&
               (pinfo->fd->num >= session_state->first_auth_frame) &&
               ((session_state->last_auth_frame == 0) || (pinfo->fd->num <= session_state->last_auth_frame))) {
-                 decrypt = tvb_get_ephemeral_string(tvb, loffset, linelen);
+                 decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen);
                     if ((stmp_decryption_enabled) && (epan_base64_decode(decrypt) > 0)) {
                         line = decrypt;
                     } else {
@@ -832,11 +832,11 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         if (session_state->username_frame == pinfo->fd->num) {
             if (decrypt == NULL) {
                 /* This line wasn't already decrypted through the state machine */
-                 decrypt = tvb_get_ephemeral_string(tvb, loffset, linelen);
+                 decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen);
                  if (stmp_decryption_enabled) {
                    if (epan_base64_decode(decrypt) == 0) {
                        /* Go back to the original string */
-                       decrypt = tvb_get_ephemeral_string(tvb, loffset, linelen);
+                       decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen);
                    }
                  }
             }
@@ -846,11 +846,11 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         } else if (session_state->password_frame == pinfo->fd->num) {
             if (decrypt == NULL) {
                 /* This line wasn't already decrypted through the state machine */
-                 decrypt = tvb_get_ephemeral_string(tvb, loffset, linelen);
+                 decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen);
                  if (stmp_decryption_enabled) {
                    if (epan_base64_decode(decrypt) == 0) {
                        /* Go back to the original string */
-                       decrypt = tvb_get_ephemeral_string(tvb, loffset, linelen);
+                       decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen);
                    }
                  }
             }
@@ -858,17 +858,17 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                   loffset, linelen, decrypt);
             col_append_fstr(pinfo->cinfo, COL_INFO, "Pass: %s", decrypt);
         } else if (session_state->ntlm_rsp_frame == pinfo->fd->num) {
-            decrypt = tvb_get_ephemeral_string(tvb, loffset, linelen);
+            decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen);
             if (stmp_decryption_enabled) {
               if (epan_base64_decode(decrypt) == 0) {
                 /* Go back to the original string */
-                decrypt = tvb_get_ephemeral_string(tvb, loffset, linelen);
+                decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen);
                 col_append_str(pinfo->cinfo, COL_INFO, decrypt);
                 proto_tree_add_item(smtp_tree, hf_smtp_command_line, tvb,
                                     loffset, linelen, ENC_ASCII|ENC_NA);
               }
               else {
-                base64_string = tvb_get_ephemeral_string(tvb, loffset, linelen);
+                base64_string = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen);
                 dissect_ntlm_auth(tvb, pinfo, smtp_tree, base64_string);
               }
             }
@@ -902,53 +902,53 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
             if (decrypt == NULL) {
                 /* This line wasn't already decrypted through the state machine */
-                 decrypt = tvb_get_ephemeral_string(tvb, loffset + 11, linelen - 11);
+                 decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset + 11, linelen - 11);
                  if (stmp_decryption_enabled) {
                    if (epan_base64_decode(decrypt) == 0) {
                        /* Go back to the original string */
-                       decrypt = tvb_get_ephemeral_string(tvb, loffset + 11, linelen - 11);
+                       decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset + 11, linelen - 11);
                    }
                  }
             }
             proto_tree_add_string(cmdresp_tree, hf_smtp_username, tvb, loffset + 11, linelen - 11, decrypt);
-            col_append_str(pinfo->cinfo, COL_INFO, tvb_get_ephemeral_string(tvb, loffset, 11));
+            col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, 11));
             col_append_fstr(pinfo->cinfo, COL_INFO, "User: %s", decrypt);
           }
           else if ((linelen > 5) && (session_state->ntlm_req_frame == pinfo->fd->num) ) {
             proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb,
                               loffset + 5, linelen - 5, ENC_ASCII|ENC_NA);
-            decrypt = tvb_get_ephemeral_string(tvb, loffset + 10, linelen - 10);
+            decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset + 10, linelen - 10);
             if (stmp_decryption_enabled) {
               if (epan_base64_decode(decrypt) == 0) {
                   /* Go back to the original string */
-                  decrypt = tvb_get_ephemeral_string(tvb, loffset + 10, linelen - 10);
-                  col_append_str(pinfo->cinfo, COL_INFO, tvb_get_ephemeral_string(tvb, loffset, 10));
+                  decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset + 10, linelen - 10);
+                  col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, 10));
                   col_append_str(pinfo->cinfo, COL_INFO, decrypt);
               }
               else {
-                base64_string = tvb_get_ephemeral_string(tvb, loffset + 10, linelen - 10);
-                col_append_str(pinfo->cinfo, COL_INFO, tvb_get_ephemeral_string(tvb, loffset, 10));
+                base64_string = tvb_get_string(wmem_packet_scope(), tvb, loffset + 10, linelen - 10);
+                col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, 10));
                 dissect_ntlm_auth(tvb, pinfo, cmdresp_tree, base64_string);
               }
             }
             else {
-              col_append_str(pinfo->cinfo, COL_INFO, tvb_get_ephemeral_string(tvb, loffset, 10));
+              col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, 10));
               col_append_str(pinfo->cinfo, COL_INFO, decrypt);
             }
           }
           else if ((linelen > 5) && (session_state->user_pass_cmd_frame == pinfo->fd->num) ) {
             proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb,
                               loffset + 5, linelen - 5, ENC_ASCII|ENC_NA);
-            col_append_str(pinfo->cinfo, COL_INFO, tvb_get_ephemeral_string(tvb, loffset, 11));
+            col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, 11));
             decode_plain_auth(tvb, pinfo, cmdresp_tree, loffset + 11, linelen - 11);
           }
           else if (linelen > 5) {
             proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb,
                               loffset + 5, linelen - 5, ENC_ASCII|ENC_NA);
-            col_append_str(pinfo->cinfo, COL_INFO, tvb_get_ephemeral_string(tvb, loffset, linelen));
+            col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen));
           }
           else {
-            col_append_str(pinfo->cinfo, COL_INFO, tvb_get_ephemeral_string(tvb, loffset, linelen));
+            col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen));
           }
 
           if (smtp_data_desegment && !spd_frame_data->more_frags) {
@@ -1093,10 +1093,10 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             decrypt = NULL;
             if (linelen >= 4) {
                 if ((stmp_decryption_enabled) && (code == 334)) {
-                    decrypt = tvb_get_ephemeral_string(tvb, offset + 4, linelen - 4);
+                    decrypt = tvb_get_string(wmem_packet_scope(), tvb, offset + 4, linelen - 4);
                     if (epan_base64_decode(decrypt) > 0) {
                       if (g_ascii_strncasecmp(decrypt, "NTLMSSP", 7) == 0) {
-                        base64_string = tvb_get_ephemeral_string(tvb, loffset + 4, linelen - 4);
+                        base64_string = tvb_get_string(wmem_packet_scope(), tvb, loffset + 4, linelen - 4);
                         col_append_fstr(pinfo->cinfo, COL_INFO, "%d ", code);
                         proto_tree_add_string(cmdresp_tree, hf_smtp_rsp_parameter, tvb,
                                           offset + 4, linelen - 4, (const char*)base64_string);
@@ -1118,10 +1118,10 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                       offset + 4, linelen - 4, ENC_ASCII|ENC_NA);
 
                     col_append_fstr(pinfo->cinfo, COL_INFO, "%d %s", code,
-                                    tvb_get_ephemeral_string(tvb, offset + 4, linelen - 4));
+                                    tvb_get_string(wmem_packet_scope(), tvb, offset + 4, linelen - 4));
                 }
             } else {
-               col_append_str(pinfo->cinfo, COL_INFO, tvb_get_ephemeral_string(tvb, offset, linelen));
+               col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, offset, linelen));
             }
           }
       }