From 1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 19 Mar 2016 20:33:14 -0400 Subject: 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 Reviewed-by: Michael Mann --- epan/dissectors/packet-ethertype.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'epan/dissectors/packet-ethertype.c') diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 4b177417d5..8a88cebf4e 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -37,12 +37,9 @@ #include "packet-eth.h" void proto_register_ethertype(void); -void proto_reg_handoff_ethertype(void); static dissector_table_t ethertype_dissector_table; -static dissector_handle_t data_handle; - static int proto_ethertype = -1; const value_string etype_vals[] = { @@ -281,7 +278,7 @@ dissect_ethertype(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat if (!dissector_found) { /* No sub-dissector found. Label rest of packet as "Data" */ - call_dissector(data_handle,next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); /* Label protocol */ col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "0x%04x", ethertype_data->etype); @@ -358,12 +355,6 @@ proto_register_ethertype(void) register_decode_as(ðertype_da); } -void -proto_reg_handoff_ethertype(void) -{ - data_handle = find_dissector("data"); -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * -- cgit v1.2.3