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-asf.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-asf.c')
| -rw-r--r-- | epan/dissectors/packet-asf.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c index 986ae6d2db..a94282369f 100644 --- a/epan/dissectors/packet-asf.c +++ b/epan/dissectors/packet-asf.c @@ -57,7 +57,6 @@ static int hf_asf_auth_alg = -1; static int hf_asf_integrity_alg = -1; static int hf_asf_reserved = -1; -static dissector_handle_t data_handle; static gint ett_asf = -1; static gint ett_asf_payload = -1; static gint ett_asf_alg_payload = -1; @@ -189,7 +188,7 @@ dissect_asf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) default: next_tvb = tvb_new_subset_length(tvb, 8, len); - call_dissector(data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); break; } } @@ -388,8 +387,6 @@ proto_reg_handoff_asf(void) { dissector_handle_t asf_handle; - data_handle = find_dissector("data"); - asf_handle = create_dissector_handle(dissect_asf, proto_asf); dissector_add_uint("rmcp.class", RMCP_CLASS_ASF, asf_handle); } |