aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-idp.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-06-29 09:13:51 -0400
committerMichael Mann <mmann78@netscape.net>2014-06-29 14:52:33 +0000
commite8a8d62dc33099ee2e0d9d405b48e74097f7688d (patch)
tree0d79d9841b29f735cdf0005da3a6c747591586ea /epan/dissectors/packet-idp.c
parentfe4b7ee625c046bc09a7d8ae55afb0e16cb17fc3 (diff)
proto_tree_add_subtree[_format]
Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-idp.c')
-rw-r--r--epan/dissectors/packet-idp.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c
index 367fc8f64d..f914f2cad1 100644
--- a/epan/dissectors/packet-idp.c
+++ b/epan/dissectors/packet-idp.c
@@ -79,8 +79,8 @@ static const value_string idp_socket_vals[] = {
static void
dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- proto_tree *idp_tree = NULL;
- proto_item *ti = NULL;
+ proto_tree *idp_tree;
+ proto_item *ti;
guint16 length;
guint8 type;
tvbuff_t *next_tvb;
@@ -88,10 +88,8 @@ dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDP");
col_clear(pinfo->cinfo, COL_INFO);
- if (tree) {
- ti = proto_tree_add_item(tree, proto_idp, tvb, 0, IDP_HEADER_LEN, ENC_NA);
- idp_tree = proto_item_add_subtree(ti, ett_idp);
- }
+ ti = proto_tree_add_item(tree, proto_idp, tvb, 0, IDP_HEADER_LEN, ENC_NA);
+ idp_tree = proto_item_add_subtree(ti, ett_idp);
proto_tree_add_item(idp_tree, hf_idp_checksum, tvb, 0, 2, ENC_BIG_ENDIAN);
length = tvb_get_ntohs(tvb, 2);