diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-09-11 17:41:13 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-09-15 02:20:13 +0000 |
| commit | 51360b538016523bb2d2670c7bcb51f127a757e7 (patch) | |
| tree | f390e21736bbc9711a4e97cc9cd5c00ed34c1ec0 /epan | |
| parent | aebc99a49c325fa26040cd8bf4b8342a49b541e4 (diff) | |
| download | wireshark-51360b538016523bb2d2670c7bcb51f127a757e7.tar.gz | |
Eliminate proto_tree_add_text from odds and ends.
A few calls in the epan directory and comments in the ui directory
Change-Id: Ia8f8830ac6909ab94d3a03283bfd173456bc9718
Reviewed-on: https://code.wireshark.org/review/10492
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dvb_chartbl.c | 2 | ||||
| -rw-r--r-- | epan/tpg.h | 3 | ||||
| -rw-r--r-- | epan/tvbparse.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/epan/dvb_chartbl.c b/epan/dvb_chartbl.c index d1662d2341..69886e9c88 100644 --- a/epan/dvb_chartbl.c +++ b/epan/dvb_chartbl.c @@ -284,7 +284,7 @@ dvb_add_chartbl(proto_tree *tree, int hf, if (length==0) { proto_item *pi; - pi = proto_tree_add_text(tree, NULL, 0, 0, + pi = proto_tree_add_bytes_format(tree, hf, tvb, 0, 0, NULL, "Default character table (Latin)"); PROTO_ITEM_SET_GENERATED(pi); } diff --git a/epan/tpg.h b/epan/tpg.h index ce40fee313..d4065c0a81 100644 --- a/epan/tpg.h +++ b/epan/tpg.h @@ -75,8 +75,7 @@ WS_DLL_PUBLIC guint8* tpg_ipv6(tvbparse_elem_t*); #define TPG_ADD_UINT(tpg, hfid, elem, value) proto_tree_add_uint(ep_stack_peek(((tpg_parser_data_t*)tpg)->stack), hfid, (elem)->tvb, (elem)->offset, (elem)->len, value) #define TPG_ADD_IPV4(tpg, hfid, elem, value) proto_tree_add_ipv4(ep_stack_peek(((tpg_parser_data_t*)tpg)->stack), hfid, (elem)->tvb, (elem)->offset, (elem)->len, value) #define TPG_ADD_IPV6(tpg, hfid, elem, value) proto_tree_add_ipv6(ep_stack_peek(((tpg_parser_data_t*)tpg)->stack), hfid, (elem)->tvb, (elem)->offset, (elem)->len, value) -#define TPG_ADD_TEXT(tpg, elem) proto_tree_add_text(ep_stack_peek(((tpg_parser_data_t*)tpg)->stack), (elem)->tvb, (elem)->offset, (elem)->len, \ - "%s",tvb_format_text((elem)->tvb, (elem)->offset, (elem)->len)) +#define TPG_ADD_TEXT(tpg, elem) proto_tree_add_format_text(ep_stack_peek(((tpg_parser_data_t*)tpg)->stack), (elem)->tvb, (elem)->offset, (elem)->len) #define TPG_SET_TEXT(pi, elem) proto_item_set_text((pi), "%s",tvb_format_text((elem)->tvb, (elem)->offset, (elem)->len)) diff --git a/epan/tvbparse.c b/epan/tvbparse.c index 884fb08114..4f400597ff 100644 --- a/epan/tvbparse.c +++ b/epan/tvbparse.c @@ -1366,7 +1366,7 @@ void tvbparse_tree_add_elem(proto_tree* tree, tvbparse_elem_t* curr) { frame->elem = curr; while (curr) { - pi = proto_tree_add_text(frame->tree,curr->tvb,curr->offset,curr->len,"%s",tvb_format_text(curr->tvb,curr->offset,curr->len)); + pi = proto_tree_add_format_text(frame->tree,curr->tvb,curr->offset,curr->len); if(curr->sub) { frame->elem = curr; |