diff options
Diffstat (limited to 'capinfos.c')
-rw-r--r-- | capinfos.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/capinfos.c b/capinfos.c index 10de75e5f4..e51d6eaf15 100644 --- a/capinfos.c +++ b/capinfos.c @@ -1464,23 +1464,10 @@ main(int argc, char *argv[]) g_free(init_progfile_dir_error); } - wtap_init(); - -#ifdef HAVE_PLUGINS init_report_message(failure_warning_message, failure_warning_message, NULL, NULL, NULL); - /* Scan for plugins. This does *not* call their registration routines; - that's done later. - - Don't report failures to load plugins because most (non-wiretap) - plugins *should* fail to load (because we're not linked against - libwireshark and dissector plugins need libwireshark). */ - scan_plugins(DONT_REPORT_LOAD_FAILURE); - - /* Register all libwiretap plugin modules. */ - register_all_wiretap_modules(); -#endif + wtap_init(); /* Process the options */ while ((opt = getopt_long(argc, argv, "abcdehiklmoqrstuvxyzABCEFHIKLMNQRST", long_options, NULL)) !=-1) { @@ -1732,9 +1719,6 @@ exit: g_free(hash_buf); wtap_cleanup(); free_progdirs(); -#ifdef HAVE_PLUGINS - plugins_cleanup(); -#endif return overall_error_status; } |