diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-28 21:43:51 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-29 23:10:12 +0000 |
| commit | ed58d88db121eb05e901335ab2a5d5dc41f577d3 (patch) | |
| tree | af5f7215b0818fb2346595d542fd4827982c3567 | |
| parent | 0d414e5d7fc6d466974bbc935c3543cb8f840f6c (diff) | |
| download | wireshark-ed58d88db121eb05e901335ab2a5d5dc41f577d3.tar.gz | |
Remove some proto_tree_add_text outside the dissector directory.
Change-Id: I890846a0cede755a603243b4048fb5c917b2826b
Reviewed-on: https://code.wireshark.org/review/6112
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/gcp.c | 6 | ||||
| -rw-r--r-- | epan/oids.c | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/epan/gcp.c b/epan/gcp.c index 4f5287f3c1..65797d30bf 100644 --- a/epan/gcp.c +++ b/epan/gcp.c @@ -718,8 +718,7 @@ void gcp_analyze_msg(proto_tree* gcp_tree, packet_info* pinfo, tvbuff_t* gcp_tvb PROTO_ITEM_SET_GENERATED(ctx_item); if (ctx->cmds) { - proto_item* history_item = proto_tree_add_text(ctx_tree,gcp_tvb,0,0,"[ Command History ]"); - proto_tree* history_tree = proto_item_add_subtree(history_item,ids->ett.ctx_cmds); + proto_tree* history_tree = proto_tree_add_subtree(ctx_tree,gcp_tvb,0,0,ids->ett.ctx_cmds,NULL,"[ Command History ]"); for (c = ctx->cmds; c; c = c->next) { proto_item* cmd_item = proto_tree_add_uint(history_tree,ids->hf.ctx_cmd,gcp_tvb,0,0,c->cmd->msg->framenum); @@ -732,8 +731,7 @@ void gcp_analyze_msg(proto_tree* gcp_tree, packet_info* pinfo, tvbuff_t* gcp_tvb } if (( ctx_term = ctx->terms.next )) { - proto_item* terms_item = proto_tree_add_text(ctx_tree,gcp_tvb,0,0,"[ Terminations Used ]"); - proto_tree* terms_tree = proto_item_add_subtree(terms_item,ids->ett.ctx_terms); + proto_tree* terms_tree = proto_tree_add_subtree(ctx_tree,gcp_tvb,0,0,ids->ett.ctx_terms,NULL,"[ Terminations Used ]"); for (; ctx_term; ctx_term = ctx_term->next ) { if ( ctx_term->term && ctx_term->term->str) { diff --git a/epan/oids.c b/epan/oids.c index dbb7e79215..d1d270eee1 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -1296,7 +1296,7 @@ void add_oid_debug_subtree(oid_info_t* oid_info, proto_tree *tree) { static const char* key_types[] = {"OID_KEY_TYPE_WRONG","OID_KEY_TYPE_INTEGER", "OID_KEY_TYPE_FIXED_STRING","OID_KEY_TYPE_FIXED_BYTES","OID_KEY_TYPE_STRING", "OID_KEY_TYPE_BYTES","OID_KEY_TYPE_NSAP","OID_KEY_TYPE_OID","OID_KEY_TYPE_IPADDR"}; - proto_item* pi = proto_tree_add_text(tree,NULL,0,0, + proto_item* pi = proto_tree_add_debug_text(tree,NULL,0,0, "OidInfo: Name='%s' sub-id=%u kind=%s hfid=%d", oid_info->name ? oid_info->name : "", oid_info->subid, @@ -1306,7 +1306,7 @@ void add_oid_debug_subtree(oid_info_t* oid_info, proto_tree *tree) { oid_key_t* key; for(key = oid_info->key; key; key = key->next) { - proto_tree_add_text(pt,NULL,0,0, + proto_tree_add_debug_text(pt,NULL,0,0, "Key: name='%s' num_subids=%d type=%s", key->name, key->key_type <= OID_KEY_TYPE_IPADDR ? key_types[key->key_type] : "BROKEN" @@ -1314,7 +1314,7 @@ void add_oid_debug_subtree(oid_info_t* oid_info, proto_tree *tree) { }; if (oid_info->parent) { - pi = proto_tree_add_text(pt,NULL,0,0,"Parent:"); + pi = proto_tree_add_debug_text(pt,NULL,0,0,"Parent:"); pt = proto_item_add_subtree(pi,0); add_oid_debug_subtree(oid_info->parent, pt); } |