diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-12-04 13:42:07 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-12-04 21:42:44 +0000 |
| commit | ab07f8e0f89eb1bb2c2c61c71e44e3fd0e31cc52 (patch) | |
| tree | 20210444e46c0c198c62d47fa6619ce8cfd832f0 /reordercap.c | |
| parent | 51d23c6959edfbf45033ba26237820fa2914ff77 (diff) | |
| download | wireshark-ab07f8e0f89eb1bb2c2c61c71e44e3fd0e31cc52.tar.gz wireshark-ab07f8e0f89eb1bb2c2c61c71e44e3fd0e31cc52.tar.bz2 wireshark-ab07f8e0f89eb1bb2c2c61c71e44e3fd0e31cc52.zip | |
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 <guy@alum.mit.edu>
Diffstat (limited to 'reordercap.c')
| -rw-r--r-- | reordercap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/reordercap.c b/reordercap.c index 812825c6d0..004cb158b7 100644 --- a/reordercap.c +++ b/reordercap.c @@ -219,7 +219,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 */ @@ -227,9 +228,6 @@ main(int argc, char *argv[]) g_warning("reordercap: 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; |