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/tvbparse.c | |
parent | c4a608a94071f4a23eaf16fd3ab9545e26309f76 (diff) | |
download | wireshark-a0c53ffaa1bb46d8c9db2ec739401aa411c9790e.tar.gz |
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/tvbparse.c')
-rw-r--r-- | epan/tvbparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/tvbparse.c b/epan/tvbparse.c index dd7b94cd7b..64e8a38837 100644 --- a/epan/tvbparse.c +++ b/epan/tvbparse.c @@ -515,7 +515,7 @@ static int cond_hash(tvbparse_t* tt, const int offset, const tvbparse_wanted_t* if (key_len < 0) return -1; - key = tvb_get_ephemeral_string(key_elem->tvb,key_elem->offset,key_elem->len); + key = tvb_get_string(wmem_packet_scope(),key_elem->tvb,key_elem->offset,key_elem->len); #ifdef TVBPARSE_DEBUG if (TVBPARSE_DEBUG & TVBPARSE_DEBUG_HASH) g_warning("cond_hash: got key='%s'",key); #endif |