aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-27 19:29:10 +0100
committerMax Kellermann <max@duempel.org>2014-02-27 19:29:10 +0100
commitd64edb68966ebba3b15a5c3c5fb863db73f1aec3 (patch)
tree3b7a5faff5edf0933ddb84a787848a4af481d243
parent3f9ad8e104887bac46e778b0ee4c9ea298a488aa (diff)
downloadmpd-d64edb68966ebba3b15a5c3c5fb863db73f1aec3.tar.gz
mpd-d64edb68966ebba3b15a5c3c5fb863db73f1aec3.tar.xz
mpd-d64edb68966ebba3b15a5c3c5fb863db73f1aec3.zip
db/simple: GetRoot() returns reference
-rw-r--r--src/db/plugins/simple/SimpleDatabasePlugin.hxx4
-rw-r--r--src/db/update/Service.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.hxx b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
index 40d870460..9836a6bcf 100644
--- a/src/db/plugins/simple/SimpleDatabasePlugin.hxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.hxx
@@ -58,10 +58,10 @@ public:
Error &error);
gcc_pure
- Directory *GetRoot() {
+ Directory &GetRoot() {
assert(root != NULL);
- return root;
+ return *root;
}
bool Save(Error &error);
diff --git a/src/db/update/Service.cxx b/src/db/update/Service.cxx
index 0c93ce36e..2971998e4 100644
--- a/src/db/update/Service.cxx
+++ b/src/db/update/Service.cxx
@@ -84,7 +84,7 @@ UpdateService::Task()
SetThreadIdlePriority();
- modified = walk->Walk(*db.GetRoot(), next.path_utf8.c_str(),
+ modified = walk->Walk(db.GetRoot(), next.path_utf8.c_str(),
next.discard);
if (modified || !db.FileExists()) {