diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-15 08:00:10 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 03:50:05 +0000 |
| commit | bbdd89b973353a0df1d98d884c38f3832670bfea (patch) | |
| tree | 9b992f923f565af2fcab30902508a191de85ca53 /epan/dissectors/packet-daap.c | |
| parent | 6012ba8f008bfba24fd44ce7a2a3055572453dce (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: Ie514f126352e7598acc4f7c38db9c61d105d5e48
Reviewed-on: https://code.wireshark.org/review/11850
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-daap.c')
| -rw-r--r-- | epan/dissectors/packet-daap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index dffb8f2c53..7ceebc71f0 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.c @@ -397,8 +397,8 @@ static gint ett_daap_sub = -1; /* Forward declarations */ static void dissect_daap_one_tag(proto_tree *tree, tvbuff_t *tvb); -static void -dissect_daap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_daap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; proto_tree *daap_tree; @@ -415,7 +415,7 @@ dissect_daap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (first_tag == daap_png) { call_dissector(png_handle, tvb, pinfo, tree); - return; + return tvb_captured_length(tvb); } /* This is done in two functions on purpose. If the tvb_get_xxx() @@ -429,6 +429,7 @@ dissect_daap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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); + return tvb_captured_length(tvb); } static void @@ -773,7 +774,7 @@ proto_reg_handoff_daap(void) { dissector_handle_t daap_handle; - daap_handle = create_dissector_handle(dissect_daap, proto_daap); + daap_handle = new_create_dissector_handle(dissect_daap, proto_daap); http_port_add(TCP_PORT_DAAP); dissector_add_string("media_type", "application/x-dmap-tagged", daap_handle); |