Skip to content

M
mpd
Commit 3caef29b authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

test/DumpDatabase: allocate ConfigData on the stack

parent 5f95c073
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
test/DumpDatabase.cxx
View file @ 3caef29b
...@@ -26,7 +26,8 @@ ...@@ -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 { ...@@ -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 { ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment