diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-30 17:53:13 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-30 19:05:33 +0100 |
| commit | daa46477125145dd943122c8064c7271a1a9429f (patch) | |
| tree | a61133ceccefa6f5a4bc6be49ecc97c5877a2002 | |
| parent | c67668d6dde56b6e25f3bc0f8a5965ffb0945d41 (diff) | |
ConfigOption: rename to ConfigTemplate
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/ConfigFile.cxx | 6 | ||||
| -rw-r--r-- | src/ConfigTemplates.hxx (renamed from src/ConfigOptions.hxx) | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 5d34286c..68552f74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -148,6 +148,7 @@ src_mpd_SOURCES = \ src/Idle.cxx src/Idle.hxx \ src/CommandLine.cxx src/CommandLine.hxx \ src/ConfigFile.cxx \ + src/ConfigTemplates.hxx \ src/CrossFade.cxx src/CrossFade.hxx \ src/cue/cue_parser.c src/cue/cue_parser.h \ src/decoder_error.h \ diff --git a/src/ConfigFile.cxx b/src/ConfigFile.cxx index c49e4a48..2c8238c2 100644 --- a/src/ConfigFile.cxx +++ b/src/ConfigFile.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "conf.h" -#include "ConfigOptions.hxx" +#include "ConfigTemplates.hxx" extern "C" { #include "utils.h" @@ -46,7 +46,7 @@ extern "C" { #define CONF_COMMENT '#' -static GSList *config_params[G_N_ELEMENTS(config_options)]; +static GSList *config_params[G_N_ELEMENTS(config_templates)]; static bool get_bool(const char *value, bool *value_r) @@ -318,7 +318,7 @@ ReadConfigFile(const Path &path, GError **error_r) return false; } - const ConfigOption &option = config_options[i]; + const ConfigTemplate &option = config_templates[i]; GSList *¶ms = config_params[i]; if (params != NULL && !option.repeatable) { diff --git a/src/ConfigOptions.hxx b/src/ConfigTemplates.hxx index 5e2ec189..8592070c 100644 --- a/src/ConfigOptions.hxx +++ b/src/ConfigTemplates.hxx @@ -23,13 +23,13 @@ #include <string.h> -struct ConfigOption { +struct ConfigTemplate { const char *const name; const bool repeatable; const bool block; }; -static constexpr struct ConfigOption config_options[] = { +static constexpr struct ConfigTemplate config_templates[] = { { CONF_MUSIC_DIR, false, false }, { CONF_PLAYLIST_DIR, false, false }, { CONF_FOLLOW_INSIDE_SYMLINKS, false, false }, @@ -90,8 +90,8 @@ gcc_pure static int ConfigFindByName(const char *name) { - for (unsigned i = 0; i < G_N_ELEMENTS(config_options); ++i) - if (strcmp(config_options[i].name, name) == 0) + for (unsigned i = 0; i < G_N_ELEMENTS(config_templates); ++i) + if (strcmp(config_templates[i].name, name) == 0) return i; return -1; |