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-cosine.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-cosine.c')
| -rw-r--r-- | epan/dissectors/packet-cosine.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c index 13da1374de..9778656ad1 100644 --- a/epan/dissectors/packet-cosine.c +++ b/epan/dissectors/packet-cosine.c @@ -51,7 +51,6 @@ static dissector_handle_t ppp_hdlc_handle; static dissector_handle_t llc_handle; static dissector_handle_t chdlc_handle; static dissector_handle_t fr_handle; -static dissector_handle_t data_handle; static int dissect_cosine(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -134,7 +133,7 @@ dissect_cosine(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ break; case COSINE_ENCAP_TEST: case COSINE_ENCAP_UNKNOWN: - call_dissector(data_handle, tvb, pinfo, tree); + call_data_dissector(tvb, pinfo, tree); break; default: break; @@ -185,7 +184,6 @@ proto_reg_handoff_cosine(void) llc_handle = find_dissector_add_dependency("llc", proto_cosine); chdlc_handle = find_dissector_add_dependency("chdlc", proto_cosine); fr_handle = find_dissector_add_dependency("fr", proto_cosine); - data_handle = find_dissector("data"); cosine_handle = create_dissector_handle(dissect_cosine, proto_cosine); dissector_add_uint("wtap_encap", WTAP_ENCAP_COSINE, cosine_handle); |