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/tvbparse.c | |
| parent | 10261d120283cb739118fa7178b4e911ed72de14 (diff) | |
| download | wireshark-3606f80d9e297c2c1fd8e69b2d2a9e13a99d4344.tar.gz | |
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/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 4f400597ff..eb6f04c518 100644 --- a/epan/tvbparse.c +++ b/epan/tvbparse.c @@ -481,7 +481,7 @@ static int cond_hash(tvbparse_t* tt, const int offset, const tvbparse_wanted_t* if (key_len < 0) return -1; - key = tvb_get_string(wmem_packet_scope(),key_elem->tvb,key_elem->offset,key_elem->len); + key = tvb_get_string_enc(wmem_packet_scope(),key_elem->tvb,key_elem->offset,key_elem->len, ENC_ASCII); #ifdef TVBPARSE_DEBUG if (TVBPARSE_DEBUG & TVBPARSE_DEBUG_HASH) g_warning("cond_hash: got key='%s'",key); #endif |