From f7987091bab94f2403024c34702e9d5007a5d790 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Wed, 25 Jun 2014 22:59:50 -0400 Subject: convert to proto_tree_add_subtree[_format] Change-Id: I525ac2aae2bdbfd5f3a2f3b35f1bf10dde053f66 Reviewed-on: https://code.wireshark.org/review/2667 Tested-by: Michael Mann Reviewed-by: Michael Mann --- epan/dissectors/packet-fractalgeneratorprotocol.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'epan/dissectors/packet-fractalgeneratorprotocol.c') diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c index dc9ea620be..d93c497f6e 100644 --- a/epan/dissectors/packet-fractalgeneratorprotocol.c +++ b/epan/dissectors/packet-fractalgeneratorprotocol.c @@ -172,15 +172,10 @@ dissect_fractalgeneratorprotocol(tvbuff_t *message_tvb, packet_info *pinfo, prot col_set_str(pinfo->cinfo, COL_PROTOCOL, "FractalGeneratorProtocol"); - /* In the interest of speed, if "tree" is NULL, don't do any work not - necessary to generate protocol tree items. */ - if (tree) { - /* create the fractalgeneratorprotocol protocol tree */ - fractalgeneratorprotocol_item = proto_tree_add_item(tree, proto_fractalgeneratorprotocol, message_tvb, 0, -1, ENC_NA); - fractalgeneratorprotocol_tree = proto_item_add_subtree(fractalgeneratorprotocol_item, ett_fractalgeneratorprotocol); - } else { - fractalgeneratorprotocol_tree = NULL; - }; + /* create the fractalgeneratorprotocol protocol tree */ + fractalgeneratorprotocol_item = proto_tree_add_item(tree, proto_fractalgeneratorprotocol, message_tvb, 0, -1, ENC_NA); + fractalgeneratorprotocol_tree = proto_item_add_subtree(fractalgeneratorprotocol_item, ett_fractalgeneratorprotocol); + /* dissect the message */ dissect_fractalgeneratorprotocol_message(message_tvb, pinfo, fractalgeneratorprotocol_tree); return(TRUE); -- cgit v1.2.3