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

db/simple/Directory: rename LookupResult::uri to "rest"

Browse Source
This commit is contained in:
Max Kellermann
2020-04-03 17:06:25 +02:00
parent 870151214d
commit 6c8eb3c7ed
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/db/update/Service.cxx
View File

@@ -192,17 +192,17 @@ UpdateService::Enqueue(const char *path, bool discard)
if (db2 == nullptr)
throw std::runtime_error("Cannot update this type of database");
if (lr.uri == nullptr) {
if (lr.rest == nullptr) {
storage2 = storage.GetMount(path);
path = "";
} else {
assert(lr.uri > path);
assert(lr.uri < path + strlen(path));
assert(lr.uri[-1] == '/');
assert(lr.rest > path);
assert(lr.rest < path + strlen(path));
assert(lr.rest[-1] == '/');
const std::string mountpoint(path, lr.uri - 1);
const std::string mountpoint(path, lr.rest - 1);
storage2 = storage.GetMount(mountpoint.c_str());
path = lr.uri;
path = lr.rest;
}
} else {
/* use the "root" database/storage */