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

test/DumpDatabase: allocate ConfigData on the stack

This commit is contained in:
Max Kellermann 2018-08-19 22:34:10 +02:00
parent 5f95c07305
commit 3caef29b93
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/DumpDatabase.cxx
View File

@ -26,7 +26,8 @@
#include "db/LightDirectory.hxx" #include "db/LightDirectory.hxx"
#include "song/LightSong.hxx" #include "song/LightSong.hxx"
#include "db/PlaylistVector.hxx" #include "db/PlaylistVector.hxx"
#include "config/Global.hxx" #include "config/File.hxx"
#include "config/Migrate.hxx"
#include "config/Data.hxx" #include "config/Data.hxx"
#include "config/Param.hxx" #include "config/Param.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
@ -50,11 +51,9 @@ class GlobalInit {
public: public:
GlobalInit() { GlobalInit() {
io_thread.Start(); io_thread.Start();
config_global_init();
} }
~GlobalInit() { ~GlobalInit() {
config_global_finish();
} }
EventLoop &GetEventLoop() { EventLoop &GetEventLoop() {
@ -125,9 +124,9 @@ try {
GlobalInit init; GlobalInit init;
ReadConfigFile(config_path); ConfigData config;
ReadConfigFile(config, config_path);
const auto &config = GetGlobalConfig(); Migrate(config);
TagLoadConfig(config); TagLoadConfig(config);