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-hsr.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-hsr.c')
| -rw-r--r-- | epan/dissectors/packet-hsr.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-hsr.c b/epan/dissectors/packet-hsr.c index f8e3a347f9..d07bc87be7 100644 --- a/epan/dissectors/packet-hsr.c +++ b/epan/dissectors/packet-hsr.c @@ -69,8 +69,6 @@ static dissector_table_t ethertype_subdissector_table; /* Initialize the subtree pointers */ static gint ett_hsr_frame = -1; -static dissector_handle_t data_handle; - /* Code to actually dissect the packets */ static int dissect_hsr_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -124,7 +122,7 @@ dissect_hsr_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat etype = tvb_get_ntohs(tvb, HSR_TOTAL_LENGTH); if (!dissector_try_uint(ethertype_subdissector_table, etype, next_tvb, pinfo, tree)) - call_dissector(data_handle, next_tvb, pinfo, hsr_tree); + call_data_dissector(next_tvb, pinfo, hsr_tree); return tvb_captured_length(tvb); } @@ -193,7 +191,6 @@ void proto_reg_handoff_hsr(void) dissector_add_uint("ethertype", ETHERTYPE_HSR, hsr_frame_handle); ethertype_subdissector_table = find_dissector_table("ethertype"); - data_handle = find_dissector("data"); } /* |