diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-08-09 13:43:44 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-08-10 21:39:20 +0000 |
| commit | 3635d7bed70aaf14e8172654f2b40be318e7dbfe (patch) | |
| tree | 4b0fce1dba327df9a24b4ddc267a83375c817683 /epan/dissectors/packet-hpfeeds.c | |
| parent | 18346c84778019fe6eee6906758daa120f84d5d0 (diff) | |
Eliminate proto_tree_add_text from some dissectors.
Other minor cleanup while in the neighborhood.
Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f
Reviewed-on: https://code.wireshark.org/review/3537
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/dissectors/packet-hpfeeds.c')
| -rw-r--r-- | epan/dissectors/packet-hpfeeds.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index 151b590396..33cb45f18d 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -127,15 +127,13 @@ static void dissect_hpfeeds_info_pdu(tvbuff_t *tvb, proto_tree *tree, guint offset) { guint8 len = 0; - proto_item *ti = NULL; - proto_tree *data_subtree = NULL; + proto_tree *data_subtree; guint8 *strptr = NULL; len = tvb_get_guint8(tvb, offset); /* don't move the offset yet as we need to get data after this operation */ strptr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1, len, ENC_ASCII); - ti = proto_tree_add_text(tree, tvb, offset, -1, "Broker: %s", strptr); - data_subtree = proto_item_add_subtree(ti, ett_hpfeeds); + data_subtree = proto_tree_add_subtree_format(tree, tvb, offset, -1, ett_hpfeeds, NULL, "Broker: %s", strptr); proto_tree_add_item(data_subtree, hf_hpfeeds_server_len, tvb, offset, 1, ENC_BIG_ENDIAN); |