diff options
author | Michael Mann <mmann78@netscape.net> | 2014-06-25 22:59:50 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-06-26 11:41:10 +0000 |
commit | f7987091bab94f2403024c34702e9d5007a5d790 (patch) | |
tree | a56b8dfd1c87a789563ffa3b8a7277c4bd127afe /epan/dissectors/packet-fr.c | |
parent | 732656c6f3636ba7e0672a9d8fc878255f0f8d3f (diff) |
convert to proto_tree_add_subtree[_format]
Change-Id: I525ac2aae2bdbfd5f3a2f3b35f1bf10dde053f66
Reviewed-on: https://code.wireshark.org/review/2667
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-fr.c')
-rw-r--r-- | epan/dissectors/packet-fr.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 9659b8836f..a44097f344 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -653,16 +653,15 @@ static void dissect_fr_uncompressed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - proto_item *ti = NULL; - proto_tree *fr_tree = NULL; + proto_item *ti; + proto_tree *fr_tree; col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR"); col_clear(pinfo->cinfo, COL_INFO); - if (tree) { - ti = proto_tree_add_protocol_format(tree, proto_fr, tvb, 0, -1, "Frame Relay"); - fr_tree = proto_item_add_subtree(ti, ett_fr); - } + ti = proto_tree_add_protocol_format(tree, proto_fr, tvb, 0, -1, "Frame Relay"); + fr_tree = proto_item_add_subtree(ti, ett_fr); + dissect_fr_nlpid(tvb, 0, pinfo, tree, ti, fr_tree, XDLC_U); } |