diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 11:01:56 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 10:47:10 +0000 |
| commit | a383e692c8774c2451a55d8b3f8ef9db5d037329 (patch) | |
| tree | ab6223527915ab1127a50563981816adc18b971f /epan/epan.c | |
| parent | ff845123f1f1ecef0d8e0d8980e6e9d7267e5f6b (diff) | |
Revert "tap: change glib functions to wmem."
This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985.
It breaks the registration of codec, dissector and libwiretap plugins.
Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de
Reviewed-on: https://code.wireshark.org/review/16012
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/epan/epan.c b/epan/epan.c index 82c5168297..0927172570 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -24,7 +24,6 @@ #include <stdarg.h> #include <wsutil/wsgcrypt.h> -#include <wsutil/plugins.h> #ifdef HAVE_LIBGNUTLS #include <gnutls/gnutls.h> @@ -119,12 +118,6 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da #ifdef HAVE_LIBGNUTLS gnutls_global_init(); #endif - -#ifdef HAVE_PLUGINS - /* Register all the plugin types we have. */ - epan_register_plugin_types(); /* Types known to libwireshark */ -#endif - TRY { tap_init(); prefs_init(); @@ -162,13 +155,6 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da status = FALSE; } ENDTRY; - -#ifdef HAVE_PLUGINS - /* Scan for plugins. This does *not* call their registration routines; - that's done later. */ - scan_plugins(); -#endif - return status; } |