diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-31 12:39:40 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-08-03 16:29:16 +0000 |
| commit | 3fa5625ea074908d5617111a7edfcf6d95e6108a (patch) | |
| tree | 05c5b6f0995c239b28a05ae3f61f3fdf9ff40583 /epan/dissectors/packet-artnet.c | |
| parent | 7a7a72e15508d5927ced7189e50d17a16a016dad (diff) | |
| download | wireshark-3fa5625ea074908d5617111a7edfcf6d95e6108a.tar.gz | |
Eliminate proto_tree_add_text from some dissectors.
Change-Id: Ib6024307e85d6c23decf40e9759f549c19ffe136
Reviewed-on: https://code.wireshark.org/review/3318
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-artnet.c')
| -rw-r--r-- | epan/dissectors/packet-artnet.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index f67ccd6463..d5a7b175ba 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -1111,6 +1111,7 @@ static int proto_artnet = -1; /* general */ static int hf_artnet_filler = -1; static int hf_artnet_spare = -1; +static int hf_artnet_data = -1; static int hf_artnet_excess_bytes = -1; /* Header */ @@ -3114,16 +3115,15 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { default: - if (tree && tvb_reported_length_remaining(tvb, offset) > 0) { - proto_tree_add_text(artnet_tree, tvb, offset, -1, - "Data (%d bytes)", tvb_reported_length_remaining(tvb, offset)); + if (tvb_reported_length_remaining(tvb, offset) > 0) { + proto_tree_add_item(artnet_tree, hf_artnet_data, tvb, offset, -1, ENC_NA); } return; } - if (tree && tvb_reported_length_remaining(tvb, offset) > 0) { + if (tvb_reported_length_remaining(tvb, offset) > 0) { proto_tree_add_item(artnet_tree, hf_artnet_excess_bytes, tvb, - offset, tvb_reported_length_remaining(tvb, offset), ENC_NA); + offset, -1, ENC_NA); } } @@ -3159,6 +3159,12 @@ proto_register_artnet(void) { FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_artnet_data, + { "Data", + "artnet.data", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, + { &hf_artnet_filler, { "filler", "artnet.filler", |