From f4b0abc7296bbb431e64e31f85b24c29196c2ae4 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Fri, 16 Dec 2016 20:06:11 -0500 Subject: Dissectors don't need a journey of self discovery. They already know who they are when they register themselves. Saving the handle then to avoid finding it later. Not sure if this will increase unnecessary register_dissector functions (instead of using create_dissector_handle in proto_reg_handoff function) when other dissectors copy/paste, but it should make startup time a few microseconds better. Change-Id: I3839be791b32b84887ac51a6a65fb5733e9f1f43 Reviewed-on: https://code.wireshark.org/review/19481 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-usb-audio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-usb-audio.c') diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c index 8376d9c6c4..43fe1b479c 100644 --- a/epan/dissectors/packet-usb-audio.c +++ b/epan/dissectors/packet-usb-audio.c @@ -137,6 +137,7 @@ static gint ett_ac_if_input_channelconfig = -1; static gint ett_ac_if_mu_channelconfig = -1; static dissector_handle_t sysex_handle; +static dissector_handle_t usb_audio_bulk_handle; #define AUDIO_IF_SUBCLASS_UNDEFINED 0x00 #define AUDIO_IF_SUBCLASS_AUDIOCONTROL 0x01 @@ -1302,19 +1303,18 @@ proto_register_usb_audio(void) register_init_routine(&midi_data_reassemble_init); register_cleanup_routine(&midi_data_reassemble_cleanup); - register_dissector("usbaudio", dissect_usb_audio_bulk, proto_usb_audio); + usb_audio_bulk_handle = register_dissector("usbaudio", dissect_usb_audio_bulk, proto_usb_audio); } void proto_reg_handoff_usb_audio(void) { - dissector_handle_t usb_audio_bulk_handle, usb_audio_descr_handle; + dissector_handle_t usb_audio_descr_handle; usb_audio_descr_handle = create_dissector_handle( dissect_usb_audio_descriptor, proto_usb_audio); dissector_add_uint("usb.descriptor", IF_CLASS_AUDIO, usb_audio_descr_handle); - usb_audio_bulk_handle = find_dissector("usbaudio"); dissector_add_uint("usb.bulk", IF_CLASS_AUDIO, usb_audio_bulk_handle); sysex_handle = find_dissector_add_dependency("sysex", proto_usb_audio); -- cgit v1.2.3