aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-noe.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-07-04 11:51:09 -0400
committerMichael Mann <mmann78@netscape.net>2014-07-04 16:46:14 +0000
commit93517043e96c26a1d3dad49c2f57b345e3bbbba0 (patch)
tree6cde4e700e2ceffdc055051d6b97bb5df7644c70 /epan/dissectors/packet-noe.c
parentdd424c622581310b4d0d79bc57137f03d2573752 (diff)
convert to proto_tree_add_subtree[_format]
Change-Id: Idd1b20ab32c0960ea52c6f3bc5346462c37c5684 Reviewed-on: https://code.wireshark.org/review/2853 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-noe.c')
-rw-r--r--epan/dissectors/packet-noe.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c
index ffd8b96e45..ad695f20e5 100644
--- a/epan/dissectors/packet-noe.c
+++ b/epan/dissectors/packet-noe.c
@@ -938,19 +938,17 @@ static void decode_tlv(proto_tree *tree,
guint offset,
guint length)
{
- proto_item *property_item;
proto_tree *property_tree;
guint8 property_type;
guint16 property_length;
/* guint64 property_index;*/
/* add text to the frame tree */
- property_item = proto_tree_add_text(tree,
+ property_tree = proto_tree_add_subtree(tree,
tvb,
offset,
- length,
+ length, ett_body, NULL,
"NOE Message Body");
- property_tree = proto_item_add_subtree(property_item, ett_body);
while(length > 0)
{
@@ -961,7 +959,7 @@ static void decode_tlv(proto_tree *tree,
if (property_type >= P_ARRAY)
{
- proto_tree_add_item(property_item, hf_noe_aindx, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(property_tree, hf_noe_aindx, tvb, offset, 1, ENC_NA);
offset += 1;
length -= 1;
}
@@ -1030,17 +1028,15 @@ static void decode_getproperty_tlv(proto_tree *tree,
guint offset,
guint length)
{
- proto_item *body_item;
proto_tree *body_tree;
guint8 body_type;
/* add text to the frame tree */
- body_item = proto_tree_add_text(tree,
+ body_tree = proto_tree_add_subtree(tree,
tvb,
offset,
- length,
+ length, ett_property, NULL,
"NOE Message Body");
- body_tree = proto_item_add_subtree(body_item, ett_property);
while(length > 0)
{
@@ -1052,7 +1048,7 @@ static void decode_getproperty_tlv(proto_tree *tree,
if (body_type >= P_ARRAY)
{
- proto_tree_add_item(body_item, hf_noe_aindx, tvb, offset, 1, ENC_NA);
+ proto_tree_add_item(body_tree, hf_noe_aindx, tvb, offset, 1, ENC_NA);
offset += 1;
length -= 1;
}