From ab07f8e0f89eb1bb2c2c61c71e44e3fd0e31cc52 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 4 Dec 2016 13:42:07 -0800 Subject: Have a routine to do all the work of initializing libwiretap. Have programs that use libwiretap call that routine rather than separately calling some or all of init_open_routines(), wtap_register_plugin_types(), and wtap_opttypes_initialize(). Also don't have routines internal to libwiretap call those. Yes, this means doing some initialization work when it isn't necessary, but scattering on-demand calls throughout the code is a great way to forget to make those calls. Change-Id: I5828e1c5591c9d94fbb3eb0a0e54591e8fc61710 Reviewed-on: https://code.wireshark.org/review/19069 Reviewed-by: Guy Harris --- wireshark-qt.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'wireshark-qt.cpp') diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 0cc8664140..504ff0a6f8 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -537,12 +537,11 @@ int main(int argc, char *qt_argv[]) init_report_err(vfailure_alert_box, open_failure_alert_box, read_failure_alert_box, write_failure_alert_box); - init_open_routines(); + wtap_init(); #ifdef HAVE_PLUGINS /* Register all the plugin types we have. */ epan_register_plugin_types(); /* Types known to libwireshark */ - wtap_register_plugin_types(); /* Types known to libwiretap */ codec_register_plugin_types(); /* Types known to libwscodecs */ /* Scan for plugins. This does *not* call their registration routines; -- cgit v1.2.1