diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-26 22:51:11 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-28 12:05:43 +0000 |
| commit | 7bf6862ecf0d0a508bf097f3b52d07bd19128272 (patch) | |
| tree | 08dfcfd08ae0ba90383451f2a2f1d321aba7cb23 /epan/dissectors/packet-zbee-nwk.c | |
| parent | 929afd23a77b27b28fe3ca17cb063725467d387a (diff) | |
convert to proto_tree_add_subtree[_format]
Change-Id: Ia7014003a3cff5181295172978d6c613c3b83b0b
Reviewed-on: https://code.wireshark.org/review/2676
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-zbee-nwk.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-nwk.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 1ca5bfb4ed..1664d442c4 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -612,11 +612,8 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void guint16 relay_addr; guint i; - if (tree) { - /* Create a subtree for the source route field. */ - ti = proto_tree_add_text(nwk_tree, tvb, offset, 1, "Source Route"); - field_tree = proto_item_add_subtree(ti, ett_zbee_nwk_route); - } + /* Create a subtree for the source route field. */ + field_tree = proto_tree_add_subtree(nwk_tree, tvb, offset, 1, ett_zbee_nwk_route, &ti, "Source Route"); /* Get and display the relay count. */ relay_count = tvb_get_guint8(tvb, offset); @@ -733,21 +730,18 @@ dissect_zbee_nwk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data */ static void dissect_zbee_nwk_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, zbee_nwk_packet* packet) { - proto_tree *cmd_tree = NULL; - proto_item *cmd_root = NULL; + proto_tree *cmd_tree; + proto_item *cmd_root; guint offset=0; guint8 cmd_id = tvb_get_guint8(tvb, offset); /* Create a subtree for this command. */ - if (tree) { - cmd_root = proto_tree_add_text(tree, tvb, offset, tvb_length(tvb), "Command Frame: %s", - val_to_str_const(cmd_id, zbee_nwk_cmd_names, "Unknown")); - cmd_tree = proto_item_add_subtree(cmd_root, ett_zbee_nwk_cmd); + cmd_tree = proto_tree_add_subtree_format(tree, tvb, offset, -1, ett_zbee_nwk_cmd, &cmd_root, "Command Frame: %s", + val_to_str_const(cmd_id, zbee_nwk_cmd_names, "Unknown")); - /* Add the command ID. */ - proto_tree_add_uint(cmd_tree, hf_zbee_nwk_cmd_id, tvb, offset, 1, cmd_id); - } + /* Add the command ID. */ + proto_tree_add_uint(cmd_tree, hf_zbee_nwk_cmd_id, tvb, offset, 1, cmd_id); offset += 1; /* Add the command name to the info column. */ |