diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2018-09-08 16:02:06 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2018-09-09 02:27:34 +0000 |
| commit | ff1e16055fb21ddbf1cb06f193b0cd5622b5edef (patch) | |
| tree | b00da9a15528ef6ea1c4633c8e64a31be15ddbb4 /epan/epan.c | |
| parent | 6ab8d4607adccd2e5d8afe25b2be433509a98f06 (diff) | |
epan: Add argument to epan_init() to disable plugins
Change-Id: I8dc76e6bf8c4d5a3081cbdc1d47b88e857415d29
Reviewed-on: https://code.wireshark.org/review/29498
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/epan.c b/epan/epan.c index ed6373e6e0..f590a0529c 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -176,7 +176,7 @@ void epan_register_plugin(const epan_plugin *plug) #endif gboolean -epan_init(register_cb cb, gpointer client_data) +epan_init(register_cb cb, gpointer client_data, gboolean load_plugins) { volatile gboolean status = TRUE; @@ -198,9 +198,11 @@ epan_init(register_cb cb, gpointer client_data) except_init(); + if (load_plugins) { #ifdef HAVE_PLUGINS - libwireshark_plugins = plugins_init(WS_PLUGIN_EPAN); + libwireshark_plugins = plugins_init(WS_PLUGIN_EPAN); #endif + } /* initialize libgcrypt (beware, it won't be thread-safe) */ gcry_check_version(NULL); |