diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2017-02-12 22:59:32 +0100 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2017-02-12 23:17:42 +0000 |
| commit | ece6e7c1a4c2305ece68264810765d4e54ff9f49 (patch) | |
| tree | c3473b6fbaafa5ccf972830f628ae9deba152739 /epan/proto.c | |
| parent | ad2eb833c8f646c7bd8000dec30350f2fe743a33 (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/proto.c')
| -rw-r--r-- | epan/proto.c | 15 |
1 files changed, 9 insertions, 6 deletions
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 */ @@ -576,12 +583,6 @@ proto_init(void (register_all_protocols_func)(register_cb cb, gpointer client_da } static void -dissector_plugin_destroy(gpointer p) -{ - g_free(p); -} - -static void proto_cleanup_base(void) { protocol_t *protocol; @@ -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 |