diff options
| author | Max Kellermann <max@musicpd.org> | 2018-07-17 23:09:56 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-07-17 23:09:56 +0200 |
| commit | 3a4a430f6ca3e3afb7e94b5f5738e1862b8b5222 (patch) | |
| tree | 82682fbc304754c7712efcd2c4c03d17c0610880 /src/fs | |
| parent | 36db40b224a1b03c968ef7993a6948c4db460798 (diff) | |
fs/Config: use struct ConfigData
Diffstat (limited to 'src/fs')
| -rw-r--r-- | src/fs/Config.cxx | 8 | ||||
| -rw-r--r-- | src/fs/Config.hxx | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/fs/Config.cxx b/src/fs/Config.cxx index 9d51da47e..140e3becd 100644 --- a/src/fs/Config.cxx +++ b/src/fs/Config.cxx @@ -20,15 +20,17 @@ #include "config.h" #include "Config.hxx" #include "Charset.hxx" -#include "config/Global.hxx" +#include "config/Data.hxx" void -ConfigureFS() +ConfigureFS(const ConfigData &config) { #ifdef HAVE_FS_CHARSET - const char *charset = config_get_string(ConfigOption::FS_CHARSET); + const char *charset = config.GetString(ConfigOption::FS_CHARSET); if (charset != nullptr) SetFSCharset(charset); +#else + (void)config; #endif } diff --git a/src/fs/Config.hxx b/src/fs/Config.hxx index cd03e0ff7..fdc7453a6 100644 --- a/src/fs/Config.hxx +++ b/src/fs/Config.hxx @@ -22,13 +22,15 @@ #include "check.h" +struct ConfigData; + /** * Performs global one-time initialization of this class. * * Throws std::runtime_error on error. */ void -ConfigureFS(); +ConfigureFS(const ConfigData &config); void DeinitFS(); |