diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-18 15:45:17 +0100 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-09-20 01:00:37 +0000 |
| commit | 8db4ddd40c6858109369156f6ae7b14c40c3b8df (patch) | |
| tree | 0a31a7eee5ffc93bf2c57e5ecbf7f8334c55d2b4 /wsutil | |
| parent | bbbec5552d44fde57e57f52946059182482ab987 (diff) | |
Rename get_plugin_dir() for consistency
WS_DLL_PUBLIC const char *get_plugin_dir(void);
WS_DLL_PUBLIC const char *get_plugins_pers_dir(void);
Opt for the plural form consistently (for public functions at least).
Change-Id: I8a5861ad7f90f9c87168bd3275bd9dbc5c83b749
Reviewed-on: https://code.wireshark.org/review/23608
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/filesystem.c | 2 | ||||
| -rw-r--r-- | wsutil/filesystem.h | 2 | ||||
| -rw-r--r-- | wsutil/plugins.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c index 9aec7a7ca6..fd0964975a 100644 --- a/wsutil/filesystem.c +++ b/wsutil/filesystem.c @@ -1050,7 +1050,7 @@ init_plugin_pers_dir(void) * Get the directory in which the plugins are stored. */ const char * -get_plugin_dir(void) +get_plugins_dir(void) { #if defined(HAVE_PLUGINS) || defined(HAVE_LUA) if (!plugin_dir) init_plugin_dir(); diff --git a/wsutil/filesystem.h b/wsutil/filesystem.h index 4ccc159ed7..9357a437ad 100644 --- a/wsutil/filesystem.h +++ b/wsutil/filesystem.h @@ -53,7 +53,7 @@ WS_DLL_PUBLIC const char *get_progfile_dir(void); * before init_progfile_dir() is called, as they might be stored in a * subdirectory of the program file directory. */ -WS_DLL_PUBLIC const char *get_plugin_dir(void); +WS_DLL_PUBLIC const char *get_plugins_dir(void); /* * Get the personal plugin dir. diff --git a/wsutil/plugins.c b/wsutil/plugins.c index 98b78db0e5..6febafbf07 100644 --- a/wsutil/plugins.c +++ b/wsutil/plugins.c @@ -297,7 +297,7 @@ scan_plugins(plugin_load_failure_mode mode) * out-of-tree build. If we find subdirectories scan those since * they will contain plugins in the case of an in-tree build. */ - plugin_dir = get_plugin_dir(); + plugin_dir = get_plugins_dir(); if (plugin_dir == NULL) { /* We couldn't find the plugin directory. */ @@ -342,7 +342,7 @@ scan_plugins(plugin_load_failure_mode mode) else { plugin_dir_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%d.%d", - get_plugin_dir(), VERSION_MAJOR, VERSION_MINOR); + get_plugins_dir(), VERSION_MAJOR, VERSION_MINOR); plugins_scan_dir(plugin_dir_path, mode); g_free(plugin_dir_path); } |