From ece6e7c1a4c2305ece68264810765d4e54ff9f49 Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Sun, 12 Feb 2017 22:59:32 +0100 Subject: Fix compilation without plugins. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit proto.c:667:6: error: ‘dissector_plugins’ undeclared (first use in this function) tap.c:773:20: error: ‘tap_plugins’ undeclared (first use in this function) Change-Id: I8feaec4219dc97202bdb79d72399c5fd1d383e27 Reviewed-on: https://code.wireshark.org/review/20081 Petri-Dish: Jakub Zawadzki Reviewed-by: Dario Lombardo Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki --- epan/proto.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'epan/proto.c') diff --git a/epan/proto.c b/epan/proto.c index cb3ed93125..6484b6bab1 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -499,6 +499,13 @@ register_dissector_plugin_type(void) { add_plugin_type("dissector", check_for_dissector_plugin); } + +static void +dissector_plugin_destroy(gpointer p) +{ + g_free(p); +} + #endif /* HAVE_PLUGINS */ /* initialize data structures and register protocols and fields */ @@ -575,12 +582,6 @@ proto_init(void (register_all_protocols_func)(register_cb cb, gpointer client_da tree_is_expanded = g_new0(guint32, (num_tree_types/32)+1); } -static void -dissector_plugin_destroy(gpointer p) -{ - g_free(p); -} - static void proto_cleanup_base(void) { @@ -664,10 +665,12 @@ proto_cleanup(void) { proto_cleanup_base(); +#ifdef HAVE_PLUGINS if (dissector_plugins) { g_slist_free_full(dissector_plugins, dissector_plugin_destroy); dissector_plugins = NULL; } +#endif } static gboolean -- cgit v1.2.3