diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-29 09:13:51 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-29 14:52:33 +0000 |
| commit | e8a8d62dc33099ee2e0d9d405b48e74097f7688d (patch) | |
| tree | 0d79d9841b29f735cdf0005da3a6c747591586ea /epan/dissectors/packet-isis-clv.c | |
| parent | fe4b7ee625c046bc09a7d8ae55afb0e16cb17fc3 (diff) | |
proto_tree_add_subtree[_format]
Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332
Reviewed-on: https://code.wireshark.org/review/2694
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-isis-clv.c')
| -rw-r--r-- | epan/dissectors/packet-isis-clv.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/epan/dissectors/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c index 0b6e43c9c5..a701048b5e 100644 --- a/epan/dissectors/packet-isis-clv.c +++ b/epan/dissectors/packet-isis-clv.c @@ -517,7 +517,6 @@ isis_dissect_clvs(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offse guint8 code; guint8 length; int q; - proto_item *ti; proto_tree *clv_tree; while ( len > 0 ) { @@ -544,29 +543,17 @@ isis_dissect_clvs(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offse q++; } if ( opts[q].dissect ) { - if (tree) { - /* adjust by 2 for code/len octets */ - ti = proto_tree_add_text(tree, tvb, offset - 2, - length + 2, "%s (%u)", + /* adjust by 2 for code/len octets */ + clv_tree = proto_tree_add_subtree_format(tree, tvb, offset - 2, + length + 2, *opts[q].tree_id, NULL, "%s (%u)", opts[q].tree_text, length ); - clv_tree = proto_item_add_subtree(ti, - *opts[q].tree_id ); - } else { - clv_tree = NULL; - } opts[q].dissect(tvb, pinfo, clv_tree, offset, id_length, length); } else { #if 0 /* XXX: Left as commented out in case info about "unknown code" is ever to be displayed under a sub-tree */ - if (tree) { - ti = proto_tree_add_text(tree, tvb, offset - 2, - length + 2, "Unknown code %u (%u)", + clv_tree = proto_tree_add_subtree_format(tree, tvb, offset - 2, + length + 2, unknown_tree_id, NULL, "Unknown code %u (%u)", code, length); - clv_tree = proto_item_add_subtree(ti, - unknown_tree_id ); - } else { - clv_tree = NULL; - } #else if (tree) { proto_tree_add_text(tree, tvb, offset - 2, |