diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
| commit | a0c53ffaa1bb46d8c9db2ec739401aa411c9790e (patch) | |
| tree | 56a11c9e0910032ad43476462dd2c95ed65e5cc1 /epan/dissectors/packet-mmse.c | |
| parent | c4a608a94071f4a23eaf16fd3ab9545e26309f76 (diff) | |
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
Diffstat (limited to 'epan/dissectors/packet-mmse.c')
| -rw-r--r-- | epan/dissectors/packet-mmse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 87dfdc8375..8bcc968e2e 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -460,9 +460,9 @@ get_text_string(tvbuff_t *tvb, guint offset, const char **strval) len = tvb_strsize(tvb, offset); DebugLog((" [1] tvb_strsize(tvb, offset) == %u\n", len)); if (tvb_get_guint8(tvb, offset) == MM_QUOTE) - *strval = (const char *)ep_tvb_memdup(tvb, offset+1, len-1); + *strval = (const char *)tvb_memdup(wmem_packet_scope(), tvb, offset+1, len-1); else - *strval = (const char *)ep_tvb_memdup(tvb, offset, len); + *strval = (const char *)tvb_memdup(wmem_packet_scope(), tvb, offset, len); DebugLog((" [3] Return(len) == %u\n", len)); return len; } @@ -525,7 +525,7 @@ get_encoded_strval(tvbuff_t *tvb, guint offset, const char **strval) *strval = ""; } else { /* \todo Something with "Char-set", skip for now */ - *strval = (char *)tvb_get_ephemeral_string(tvb, offset + count + 1, length - 1); + *strval = (char *)tvb_get_string(wmem_packet_scope(), tvb, offset + count + 1, length - 1); } return count + length; } else @@ -1279,7 +1279,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, proto_tree_add_string_format(mmse_tree, hf_mmse_ffheader, tvb, offset, length + length2, - tvb_get_ephemeral_string(tvb, offset, + tvb_get_string(wmem_packet_scope(), tvb, offset, length + length2), "%s: %s", format_text(strval, strlen(strval)), |