aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-daap.c
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2015-06-26 22:45:43 -0700
committerMartin Kaiser <wireshark@kaiser.cx>2015-06-27 05:46:51 +0000
commitf196061889d8531355028bf856e24744977bef39 (patch)
treee5a19f385c8c1685d3a5274b1eaa4c6b25077103 /epan/dissectors/packet-daap.c
parentac9f64a9e15bf2524b5d920e6c6c7c5bfee89950 (diff)
(trivial) daap: remove if(tree) and return; at the end of a function
Change-Id: I969efbaeda75d2790165a6cbc214f58f1bd0ba7f Reviewed-on: https://code.wireshark.org/review/9190 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan/dissectors/packet-daap.c')
-rw-r--r--epan/dissectors/packet-daap.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c
index 28870d06d5..5d3e3f1325 100644
--- a/epan/dissectors/packet-daap.c
+++ b/epan/dissectors/packet-daap.c
@@ -415,11 +415,9 @@ dissect_daap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb_format_text(tvb, 0, 4),
tvb_get_ntohl(tvb, 4));
- if (tree) {
- ti = proto_tree_add_item(tree, proto_daap, tvb, 0, -1, ENC_NA);
- daap_tree = proto_item_add_subtree(ti, ett_daap);
- dissect_daap_one_tag(daap_tree, tvb);
- }
+ ti = proto_tree_add_item(tree, proto_daap, tvb, 0, -1, ENC_NA);
+ daap_tree = proto_item_add_subtree(ti, ett_daap);
+ dissect_daap_one_tag(daap_tree, tvb);
}
static void
@@ -696,7 +694,6 @@ dissect_daap_one_tag(proto_tree *tree, tvbuff_t *tvb)
if ((offset < 0) || ((reported_length - offset) != 0)) {
THROW(ReportedBoundsError);
}
- return;
}