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/tpg.h | |
| 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/tpg.h')
| -rw-r--r-- | epan/tpg.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/tpg.h b/epan/tpg.h index d4065c0a81..d4c8dff620 100644 --- a/epan/tpg.h +++ b/epan/tpg.h @@ -54,10 +54,10 @@ extern tpg_parser_data_t* tpg_start(proto_tree* root_tree, #define TPG_TREE(vp) (((tpg_parser_data_t*)(vp))->tree) #define TPG_DATA(vp,type) (((type*)(((tpg_parser_data_t*)(vp))->private_data))) -#define TPG_STRING(i) tvb_get_string(wmem_packet_scope(), (i)->tvb,(i)->offset,(i)->len) -#define TPG_INT(i) strtol(tvb_get_string(wmem_packet_scope(), (i)->tvb,(i)->offset,(i)->len),NULL,10) -#define TPG_UINT(i) strtoul(tvb_get_string(wmem_packet_scope(), (i)->tvb,(i)->offset,(i)->len),NULL,10) -#define TPG_UINT_HEX(i) strtoul(tvb_get_string(wmem_packet_scope(), (i)->tvb,(i)->offset,(i)->len),NULL,16) +#define TPG_STRING(i) tvb_get_string_enc(wmem_packet_scope(), (i)->tvb,(i)->offset,(i)->len, ENC_ASCII) +#define TPG_INT(i) strtol(tvb_get_string_enc(wmem_packet_scope(), (i)->tvb,(i)->offset,(i)->len, ENC_ASCII),NULL,10) +#define TPG_UINT(i) strtoul(tvb_get_string_enc(wmem_packet_scope(), (i)->tvb,(i)->offset,(i)->len, ENC_ASCII),NULL,10) +#define TPG_UINT_HEX(i) strtoul(tvb_get_string_enc(wmem_packet_scope(), (i)->tvb,(i)->offset,(i)->len, ENC_ASCII),NULL,16) #define TPG_TVB(i) tvb_new_subset((i)->tvb,(i)->offset,(i)->len,(i)->len) WS_DLL_PUBLIC guint32 tpg_ipv4(tvbparse_elem_t*); |