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/req_resp_hdrs.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/req_resp_hdrs.c')
| -rw-r--r-- | epan/req_resp_hdrs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/req_resp_hdrs.c b/epan/req_resp_hdrs.c index 81f9167da2..808daa7840 100644 --- a/epan/req_resp_hdrs.c +++ b/epan/req_resp_hdrs.c @@ -161,7 +161,7 @@ req_resp_hdrs_do_reassembly(tvbuff_t *tvb, const int offset, packet_info *pinfo, /* * Check if we've found Content-Length. */ - line = tvb_get_ephemeral_string(tvb, next_offset_sav, linelen); + line = tvb_get_string(wmem_packet_scope(), tvb, next_offset_sav, linelen); if (g_ascii_strncasecmp(line, "Content-Length:", 15) == 0) { /* XXX - what if it doesn't fit in an int? (Do not "fix" that by making this @@ -273,7 +273,7 @@ req_resp_hdrs_do_reassembly(tvbuff_t *tvb, const int offset, packet_info *pinfo, } /* We have a line with the chunk size in it.*/ - chunk_string = tvb_get_ephemeral_string(tvb, next_offset, + chunk_string = tvb_get_string(wmem_packet_scope(), tvb, next_offset, linelen); c = chunk_string; @@ -348,7 +348,7 @@ req_resp_hdrs_do_reassembly(tvbuff_t *tvb, const int offset, packet_info *pinfo, return TRUE; } /* Following sizeof will return the length of the string + \0 we need to not count it*/ - tmp = tvb_get_ephemeral_string(tvb, 0, sizeof("RPC_OUT_DATA") - 1); + tmp = tvb_get_string(wmem_packet_scope(), tvb, 0, sizeof("RPC_OUT_DATA") - 1); if ((strncmp(tmp, "RPC_IN_DATA", sizeof("RPC_IN_DATA") - 1) == 0) || (strncmp(tmp, "RPC_OUT_DATA", sizeof("RPC_OUT_DATA") - 1) == 0)) { return TRUE; |