path: root/randpkt.c
diff options
authorGuy Harris <guy@alum.mit.edu>2016-12-04 13:42:07 -0800
committerGuy Harris <guy@alum.mit.edu>2016-12-04 21:42:44 +0000
commitab07f8e0f89eb1bb2c2c61c71e44e3fd0e31cc52 (patch)
tree20210444e46c0c198c62d47fa6619ce8cfd832f0 /randpkt.c
parent51d23c6959edfbf45033ba26237820fa2914ff77 (diff)
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 'randpkt.c')
1 files changed, 2 insertions, 4 deletions
diff --git a/randpkt.c b/randpkt.c
index 4f90231a9d..854e5c6bc2 100644
--- a/randpkt.c
+++ b/randpkt.c
@@ -132,7 +132,8 @@ main(int argc, char **argv)
* Get credential information for later use.
- init_open_routines();
+ wtap_init();
cmdarg_err_init(failure_message, failure_message_cont);
@@ -147,9 +148,6 @@ main(int argc, char **argv)
g_warning("randpkt: init_progfile_dir(): %s", init_progfile_dir_error);
} else {
- /* Register all the plugin types we have. */
- wtap_register_plugin_types(); /* Types known to libwiretap */
/* Scan for plugins. This does *not* call their registration routines;