aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-lwm.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-06-29 17:00:12 -0400
committerMichael Mann <mmann78@netscape.net>2014-06-29 21:18:04 +0000
commitdd63ae2b8c889aa91577efe4621e6d0fe5432a99 (patch)
treeda25c2914161eba08b579a96a533b482f225c067 /epan/dissectors/packet-lwm.c
parente39e44df246c89c31d708923a181f99810240731 (diff)
proto_tree_add_subtree[_format]
Change-Id: Id00f456479415adf0a219af6c9a2108d4b3642d0 Reviewed-on: https://code.wireshark.org/review/2702 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-lwm.c')
-rw-r--r--epan/dissectors/packet-lwm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-lwm.c b/epan/dissectors/packet-lwm.c
index d00d93a0c5..90e99ec2ee 100644
--- a/epan/dissectors/packet-lwm.c
+++ b/epan/dissectors/packet-lwm.c
@@ -352,8 +352,7 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
guint16 lwm_multi_header;
lwm_multi_header = tvb_get_letohs(tvb, 7);
- ti = proto_tree_add_text(lwm_tree, tvb, 7, 2, "Multicast Header");
- multi_tree = proto_item_add_subtree(ti, ett_lwm_multi_tree);
+ multi_tree = proto_tree_add_subtree(lwm_tree, tvb, 7, 2, ett_lwm_multi_tree, NULL, "Multicast Header");
proto_tree_add_uint(multi_tree, hf_lwm_multi_nmrad, tvb, 7, 2,
(lwm_multi_header & LWM_MULTI_NON_MEM_RAD_MASK) >> LWM_MULTI_NON_MEM_RAD_OFFSET);
@@ -423,9 +422,8 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
val_to_str(lwm_cmd, lwm_cmd_names, LWM_CMD_UNKNOWN_VAL_STRING));
- ti = proto_tree_add_text(lwm_tree, new_tvb, 0, -1, "%s",
+ lwm_cmd_tree = proto_tree_add_subtree(lwm_tree, new_tvb, 0, -1, ett_lwm_cmd_tree, &ti,
val_to_str(lwm_cmd, lwm_cmd_names, LWM_CMD_UNKNOWN_VAL_STRING));
- lwm_cmd_tree = proto_item_add_subtree(ti, ett_lwm_cmd_tree);
proto_tree_add_uint(lwm_cmd_tree, hf_lwm_cmd, new_tvb, 0, 1, lwm_cmd);