oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/Config: use struct ConfigData

Browse Source
This commit is contained in:
Max Kellermann 2018-07-17 23:09:56 +02:00
parent 36db40b224
commit 3a4a430f6c
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main.cxx
View File

@ -547,7 +547,7 @@ try {
static int static int
mpd_main_after_fork(const ConfigData &raw_config, const Config &config) mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
try { try {
ConfigureFS(); ConfigureFS(raw_config);
glue_mapper_init(raw_config); glue_mapper_init(raw_config);

8
src/fs/Config.cxx
View File

@ -20,15 +20,17 @@
#include "config.h" #include "config.h"
#include "Config.hxx" #include "Config.hxx"
#include "Charset.hxx" #include "Charset.hxx"
#include "config/Global.hxx" #include "config/Data.hxx"
void void
ConfigureFS() ConfigureFS(const ConfigData &config)
{ {
#ifdef HAVE_FS_CHARSET #ifdef HAVE_FS_CHARSET
const char *charset = config_get_string(ConfigOption::FS_CHARSET); const char *charset = config.GetString(ConfigOption::FS_CHARSET);
if (charset != nullptr) if (charset != nullptr)
SetFSCharset(charset); SetFSCharset(charset);
#else
(void)config;
#endif #endif
} }

4
src/fs/Config.hxx
View File

@ -22,13 +22,15 @@
#include "check.h" #include "check.h"
struct ConfigData;
/** /**
* Performs global one-time initialization of this class. * Performs global one-time initialization of this class.
* *
* Throws std::runtime_error on error. * Throws std::runtime_error on error.
*/ */
void void
ConfigureFS(); ConfigureFS(const ConfigData &config);
void void
DeinitFS(); DeinitFS();