summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2013-03-16 09:37:06 +0000
committerMartin Kaiser <wireshark@kaiser.cx>2013-03-16 09:37:06 +0000
commit20769a8bee881a71795cc3ba7ef6d2be6799d853 (patch)
tree4825a68eddf0437beeadb0717fbc52660db55d37
parent5a85b7fed2eb804db57cde3c851a12088cc60ee7 (diff)
downloadwireshark-20769a8bee881a71795cc3ba7ef6d2be6799d853.tar.gz
no need for if(tree)
removed unnecessary initialization svn path=/trunk/; revision=48339
-rw-r--r--epan/dissectors/packet-oipf.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-oipf.c b/epan/dissectors/packet-oipf.c
index 176f7e3553..abf426bcc7 100644
--- a/epan/dissectors/packet-oipf.c
+++ b/epan/dissectors/packet-oipf.c
@@ -78,7 +78,7 @@ dissect_oipf_ciplus(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, voi
{
gint msg_len;
proto_item *ti;
- proto_tree *oipf_ciplus_tree = NULL;
+ proto_tree *oipf_ciplus_tree;
guint offset = 0;
guint8 i, send_datatype_nbr;
guint16 dat_len;
@@ -90,10 +90,8 @@ dissect_oipf_ciplus(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, voi
if (msg_len < 8)
return 0;
- if (tree) {
- ti = proto_tree_add_text(tree, tvb, 0, msg_len, "Open IPTV Forum CSPG-CI+");
- oipf_ciplus_tree = proto_item_add_subtree(ti, ett_oipf_ciplus);
- }
+ ti = proto_tree_add_text(tree, tvb, 0, msg_len, "Open IPTV Forum CSPG-CI+");
+ oipf_ciplus_tree = proto_item_add_subtree(ti, ett_oipf_ciplus);
proto_tree_add_item(oipf_ciplus_tree, hf_oipf_ciplus_cmd_id,
tvb, offset, 1, ENC_BIG_ENDIAN);