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

Main: allocate ConfigData on the stack

Browse Source
This commit is contained in:
Max Kellermann
2018-08-19 22:47:05 +02:00
parent afd0fe666a
commit 140aeea300
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Main.cxx
View File

@@ -52,7 +52,7 @@
#include "thread/Slack.hxx"
#include "net/Init.hxx"
#include "lib/icu/Init.hxx"
#include "config/Global.hxx"
#include "config/File.hxx"
#include "config/Check.hxx"
#include "config/Data.hxx"
#include "config/Param.hxx"
@@ -475,7 +475,7 @@ MainOrThrow(int argc, char *argv[])
const ODBus::ScopeInit dbus_init;
#endif
config_global_init();
ConfigData raw_config;
#ifdef ANDROID
(void)argc;
@@ -486,13 +486,12 @@ MainOrThrow(int argc, char *argv[])
const auto config_path =
sdcard / Path::FromFS("mpd.conf");
if (FileExists(config_path))
ReadConfigFile(config_path);
ReadConfigFile(raw_config, config_path);
}
#else
ParseCommandLine(argc, argv, options);
ParseCommandLine(argc, argv, options, raw_config);
#endif
const auto &raw_config = GetGlobalConfig();
InitPathParser(raw_config);
const auto config = LoadConfig(raw_config);
@@ -714,7 +713,6 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
#ifdef ENABLE_ARCHIVE
archive_plugin_deinit_all();
#endif
config_global_finish();
instance->rtio_thread.Stop();
instance->io_thread.Stop();
#ifndef ANDROID