diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-01-05 09:09:40 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-01-11 00:58:43 +0000 |
| commit | 5639b8014afd467ddf25b18dcfe993b497c97caa (patch) | |
| tree | b7892a66e89bce8bc9c1cba81d2e2743db6036dc /epan/epan.c | |
| parent | 841e24d304312cf89c5841f6624ae99f7ed0a589 (diff) | |
Use an enum for plugin types.
Make plugins.c the source of truth for plugin names. Where plugins
reside and what they do are two different things, so split the plugin
directory and description into two separate elements.
CMake creates portable[1] builds on Windows and macOS. That is, the
build-time directory layout is the same as the installation directory
layout. Adjust various plugin paths macOS accordingly.
[1] You have to run osx-app.sh on macOS to prepare the application
bundle, but the goal is to create a directory/bundle that can be moved
or copied to a different system and run in the new location.
Change-Id: Icf9d02e61918fdf1404468baf52542910edf2743
Reviewed-on: https://code.wireshark.org/review/25166
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/epan/epan.c b/epan/epan.c index 7708c46e84..0806a23141 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -4,19 +4,7 @@ * * Copyright (c) 2001 by Gerald Combs <gerald@wireshark.org> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: GPL-2.0+ */ #include "config.h" @@ -218,7 +206,7 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da except_init(); #ifdef HAVE_PLUGINS - libwireshark_plugins = plugins_init("epan"); + libwireshark_plugins = plugins_init(WS_PLUGIN_EPAN); #endif /* initialize libgcrypt (beware, it won't be thread-safe) */ |