summaryrefslogtreecommitdiff
path: root/extcap/androiddump.c
diff options
context:
space:
mode:
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 /extcap/androiddump.c
parent51d23c6959edfbf45033ba26237820fa2914ff77 (diff)
downloadwireshark-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 'extcap/androiddump.c')
-rw-r--r--extcap/androiddump.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 89dd6ec9f2..7a61cd848b 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -296,9 +296,8 @@ static struct extcap_dumper extcap_dumper_open(char *fifo, int encap) {
#else
int err = 0;
- init_open_routines();
+ wtap_init();
#ifdef HAVE_PLUGINS
- wtap_register_plugin_types();
register_all_wiretap_modules();
#endif