diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-23 20:39:28 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-24 23:42:13 +0000 |
| commit | 29ecd114bfd3ba01ee340ffa084eeeafb886f750 (patch) | |
| tree | 7eddcc9b3c8c7d41294be2aaf60c86befbd49a0b /epan/dissectors/packet-clique-rm.c | |
| parent | 83da877fffaa3de727809918070dafb4d590e1fd (diff) | |
convert to proto_tree_add_subtree[_format]
Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6
Reviewed-on: https://code.wireshark.org/review/2601
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-clique-rm.c')
| -rw-r--r-- | epan/dissectors/packet-clique-rm.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/epan/dissectors/packet-clique-rm.c b/epan/dissectors/packet-clique-rm.c index a30c5566d8..795c5a9658 100644 --- a/epan/dissectors/packet-clique-rm.c +++ b/epan/dissectors/packet-clique-rm.c @@ -135,11 +135,9 @@ dissect_sender_array(proto_tree *clique_rm_tree, int hf_header, gint ett_header, static void dissect_data_packet(proto_tree *clique_rm_tree, tvbuff_t *tvb, int offset) { - proto_item *ti; proto_tree *tree; - ti = proto_tree_add_text(clique_rm_tree, tvb, offset, -1, "Data"); - tree = proto_item_add_subtree(ti, ett_clique_rm_data); + tree = proto_tree_add_subtree(clique_rm_tree, tvb, offset, -1, ett_clique_rm_data, NULL, "Data"); proto_tree_add_item(tree, hf_clique_rm_data_flags, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -152,14 +150,13 @@ dissect_data_packet(proto_tree *clique_rm_tree, tvbuff_t *tvb, int offset) offset += 4; - proto_tree_add_item(tree, hf_clique_rm_data_data, tvb, offset, - tvb_length_remaining(tvb, offset), ENC_NA); + proto_tree_add_item(tree, hf_clique_rm_data_data, tvb, offset, -1, ENC_NA); } static int dissect_depends(proto_tree *clique_rm_tree, tvbuff_t *tvb, int offset) { - proto_item *ti, *depend_item; + proto_item *ti; proto_tree *tree, *depend_tree; guint ii, count; int len; @@ -175,8 +172,8 @@ dissect_depends(proto_tree *clique_rm_tree, tvbuff_t *tvb, int offset) tree = proto_item_add_subtree(ti, ett_clique_rm_depends); for (ii = 0; ii < count; ii++) { - depend_item = proto_tree_add_text(tree, tvb, offset, 8, "Depend item %d", ii+1); - depend_tree = proto_item_add_subtree(depend_item, ett_clique_rm_depends_item); + depend_tree = proto_tree_add_subtree_format(tree, tvb, offset, 8, + ett_clique_rm_depends_item, NULL, "Depend item %d", ii+1); proto_tree_add_item(depend_tree, hf_clique_rm_depend_sender, tvb, offset, 4, ENC_BIG_ENDIAN); |