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 /wiretap/file_access.c | |
| parent | 51d23c6959edfbf45033ba26237820fa2914ff77 (diff) | |
| download | wireshark-ab07f8e0f89eb1bb2c2c61c71e44e3fd0e31cc52.tar.gz | |
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 'wiretap/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 8650db1b07..f2a145bb5f 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -478,8 +478,6 @@ init_open_routines(void) void wtap_register_open_info(struct open_info *oi, const gboolean first_routine) { - init_open_routines(); - if (!oi || !oi->name) { g_error("No open_info name given to register"); return; @@ -517,7 +515,6 @@ void wtap_deregister_open_info(const gchar *name) { guint i; - init_open_routines(); if (!name) { g_error("Missing open_info name to de-register"); @@ -543,7 +540,6 @@ gboolean wtap_has_open_info(const gchar *name) { guint i; - init_open_routines(); if (!name) { g_error("No name given to wtap_has_open_info!"); @@ -587,7 +583,6 @@ unsigned int open_info_name_to_type(const char *name) { unsigned int i; - init_open_routines(); if (!name) return WTAP_TYPE_AUTO; @@ -735,8 +730,6 @@ wtap_open_offline(const char *filename, unsigned int type, int *err, char **err_ *err = 0; *err_info = NULL; - init_open_routines(); - /* open standard input if filename is '-' */ if (strcmp(filename, "-") == 0) use_stdin = TRUE; |