aboutsummaryrefslogtreecommitdiffstats
path: root/epan/tap.c
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2017-02-12 22:59:32 +0100
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2017-02-12 23:17:42 +0000
commitece6e7c1a4c2305ece68264810765d4e54ff9f49 (patch)
treec3473b6fbaafa5ccf972830f628ae9deba152739 /epan/tap.c
parentad2eb833c8f646c7bd8000dec30350f2fe743a33 (diff)
Fix compilation without plugins.
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 <darkjames-ws@darkjames.pl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Diffstat (limited to 'epan/tap.c')
-rw-r--r--epan/tap.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/epan/tap.c b/epan/tap.c
index c10dff4f0d..3d61203587 100644
--- a/epan/tap.c
+++ b/epan/tap.c
@@ -177,6 +177,13 @@ register_all_plugin_tap_listeners(void)
{
g_slist_foreach(tap_plugins, register_tap_plugin_listener, NULL);
}
+
+static void
+tap_plugin_destroy(gpointer p)
+{
+ g_free(p);
+}
+
#endif /* HAVE_PLUGINS */
/* **********************************************************************
@@ -744,12 +751,6 @@ union_of_tap_listener_flags(void)
return flags;
}
-static void
-tap_plugin_destroy(gpointer p)
-{
- g_free(p);
-}
-
void tap_cleanup(void)
{
volatile tap_listener_t *elem_lq;
@@ -770,7 +771,9 @@ void tap_cleanup(void)
g_free((gpointer)elem_dl);
}
+#ifdef HAVE_PLUGINS
g_slist_free_full(tap_plugins, tap_plugin_destroy);
+#endif
}
/*