diff options
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mergecap.c b/mergecap.c index c64341dd3b..f3cf9224e8 100644 --- a/mergecap.c +++ b/mergecap.c @@ -297,7 +297,8 @@ main(int argc, char *argv[]) * Get credential information for later use. */ init_process_policies(); - init_open_routines(); + + wtap_init(); #ifdef HAVE_PLUGINS /* Register wiretap plugins */ @@ -305,9 +306,6 @@ main(int argc, char *argv[]) g_warning("mergecap: init_progfile_dir(): %s", init_progfile_dir_error); g_free(init_progfile_dir_error); } else { - /* Register all the plugin types we have. */ - wtap_register_plugin_types(); /* Types known to libwiretap */ - init_report_err(failure_message,NULL,NULL,NULL); /* Scan for plugins. This does *not* call their registration routines; |