diff options
| author | Max Kellermann <max@duempel.org> | 2014-06-16 19:37:33 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-06-16 19:46:35 +0200 |
| commit | fefb35c782141b96a118dc09bddc9d588b4c2d82 (patch) | |
| tree | 9b68d484e477f8c4d1fc33a942fb3796d33622c2 /src/db | |
| parent | b2433a664c4644cd89436821c0aabc422b0f78ef (diff) | |
| download | mpd-fefb35c782141b96a118dc09bddc9d588b4c2d82.tar.gz mpd-fefb35c782141b96a118dc09bddc9d588b4c2d82.tar.xz mpd-fefb35c782141b96a118dc09bddc9d588b4c2d82.zip | |
Directory: eliminate attribute "have_stat"
Check for 0 in "device" and "inode" instead.
Diffstat (limited to 'src/db')
| -rw-r--r-- | src/db/plugins/simple/Directory.cxx | 3 | ||||
| -rw-r--r-- | src/db/plugins/simple/Directory.hxx | 1 | ||||
| -rw-r--r-- | src/db/update/Walk.cxx | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/db/plugins/simple/Directory.cxx b/src/db/plugins/simple/Directory.cxx index 6259df49f..218652b03 100644 --- a/src/db/plugins/simple/Directory.cxx +++ b/src/db/plugins/simple/Directory.cxx @@ -39,7 +39,8 @@ Directory::Directory(std::string &&_path_utf8, Directory *_parent) :parent(_parent), - mtime(0), have_stat(false), + mtime(0), + inode(0), device(0), path(std::move(_path_utf8)), mounted_database(nullptr) { diff --git a/src/db/plugins/simple/Directory.hxx b/src/db/plugins/simple/Directory.hxx index 80675bd21..acef62143 100644 --- a/src/db/plugins/simple/Directory.hxx +++ b/src/db/plugins/simple/Directory.hxx @@ -95,7 +95,6 @@ struct Directory { Directory *parent; time_t mtime; unsigned inode, device; - bool have_stat; /* not needed if ino_t == dev_t == 0 is impossible */ std::string path; diff --git a/src/db/update/Walk.cxx b/src/db/update/Walk.cxx index afb67ab29..f71faa86d 100644 --- a/src/db/update/Walk.cxx +++ b/src/db/update/Walk.cxx @@ -71,7 +71,6 @@ directory_set_stat(Directory &dir, const FileInfo &info) { dir.inode = info.inode; dir.device = info.device; - dir.have_stat = true; } inline void @@ -167,7 +166,7 @@ FindAncestorLoop(Storage &storage, Directory *parent, return 0; while (parent) { - if (!parent->have_stat && + if (parent->device == 0 && parent->inode == 0 && !update_directory_stat(storage, *parent)) return -1; |