diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-26 15:10:06 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-27 05:11:25 +0000 |
| commit | 3606f80d9e297c2c1fd8e69b2d2a9e13a99d4344 (patch) | |
| tree | 3aa83dd74b85ea84f6aea028a20e494dc674896f /epan/req_resp_hdrs.c | |
| parent | 10261d120283cb739118fa7178b4e911ed72de14 (diff) | |
Officially remove tvb_get_string and tvb_get_stringz.
Almost all replacements were done awhile ago, just put the final nail in the coffin.
Change-Id: I0a708d886da5a500c2a1e2c9ee2736794bdb9411
Reviewed-on: https://code.wireshark.org/review/12206
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
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 fff245e590..4e9d01d0d0 100644 --- a/epan/req_resp_hdrs.c +++ b/epan/req_resp_hdrs.c @@ -271,8 +271,8 @@ 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_string(wmem_packet_scope(), tvb, next_offset, - linelen); + chunk_string = tvb_get_string_enc(wmem_packet_scope(), tvb, next_offset, + linelen, ENC_ASCII); c = chunk_string; /* @@ -346,7 +346,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_string(wmem_packet_scope(), tvb, 0, sizeof("RPC_OUT_DATA") - 1); + tmp = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, sizeof("RPC_OUT_DATA") - 1, ENC_ASCII); 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; |