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 --- plugins/ethercat/packet-ethercat-frame.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'plugins/ethercat') diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c index dd71c17cf6..0d9eb5f677 100644 --- a/plugins/ethercat/packet-ethercat-frame.c +++ b/plugins/ethercat/packet-ethercat-frame.c @@ -38,7 +38,6 @@ void proto_reg_handoff_ethercat_frame(void); static int proto_ethercat_frame = -1; static dissector_table_t ethercat_frame_dissector_table; -static dissector_handle_t ethercat_frame_data_handle; /* Define the tree for the EtherCAT frame */ static int ett_ethercat_frame = -1; @@ -97,7 +96,7 @@ static int dissect_ethercat_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree col_add_fstr (pinfo->cinfo, COL_PROTOCOL, "0x%04x", hdr.v.protocol); /* No sub dissector wanted to handle this payload, decode it as general data instead. */ - call_dissector (ethercat_frame_data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } return tvb_captured_length(tvb); } @@ -151,7 +150,6 @@ void proto_reg_handoff_ethercat_frame(void) dissector_add_uint("ethertype", ETHERTYPE_ECATF, ethercat_frame_handle); dissector_add_uint("udp.port", ETHERTYPE_ECATF, ethercat_frame_handle); dissector_add_uint("tcp.port", ETHERTYPE_ECATF, ethercat_frame_handle); - ethercat_frame_data_handle = find_dissector("data"); } /* -- cgit v1.2.3