diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-03-19 20:33:14 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-20 17:38:03 +0000 |
| commit | 1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf (patch) | |
| tree | 4147c4f2bee3b93c250a49fa8ec337072c80e713 /epan/dissectors/packet-afp.c | |
| parent | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff) | |
Create call_data_dissector() to call data dissector.
This saves many dissectors the need to find the data dissector and store a handle to it.
There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.
Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-afp.c')
| -rw-r--r-- | epan/dissectors/packet-afp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index bf8df16ba7..6a81665b86 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -370,7 +370,6 @@ static expert_field ei_afp_toc_offset = EI_INIT; static int afp_tap = -1; -static dissector_handle_t data_handle; static dissector_handle_t spotlight_handle; static const value_string vol_signature_vals[] = { @@ -5520,7 +5519,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } } if (offset < len) { - call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), + call_data_dissector(tvb_new_subset_remaining(tvb, offset), pinfo, afp_tree); } @@ -7279,7 +7278,6 @@ proto_register_afp(void) void proto_reg_handoff_afp(void) { - data_handle = find_dissector("data"); spotlight_handle = find_dissector_add_dependency("afp_spotlight", proto_afp); } |