aboutsummaryrefslogtreecommitdiffstats
path: root/src/fs
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-06-24 16:17:46 +0200
committerMax Kellermann <max@duempel.org>2013-06-24 16:17:46 +0200
commitef48eca9cac875f65622daf500bd702e20d666f3 (patch)
tree52fe455c347fd0f0ab14b471e2482c17c8aed5e6 /src/fs
parent906d2fbadf075b7d8e3a5be7134a9bebb09b7285 (diff)
parente9e55b08127dc45b4c6045e1f42e34115086a521 (diff)
downloadmpd-ef48eca9cac875f65622daf500bd702e20d666f3.tar.gz
mpd-ef48eca9cac875f65622daf500bd702e20d666f3.tar.xz
mpd-ef48eca9cac875f65622daf500bd702e20d666f3.zip
Merge branch 'master' of git://git.musicpd.org/dk/mpd
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/DirectoryReader.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fs/DirectoryReader.hxx b/src/fs/DirectoryReader.hxx
index caa1e90ec..4e4a56345 100644
--- a/src/fs/DirectoryReader.hxx
+++ b/src/fs/DirectoryReader.hxx
@@ -47,14 +47,14 @@ public:
* Destroys this instance.
*/
~DirectoryReader() {
- if (!Failed())
+ if (!HasFailed())
closedir(dirp);
}
/**
* Checks if directory failed to open.
*/
- bool Failed() const {
+ bool HasFailed() const {
return dirp == nullptr;
}
@@ -62,7 +62,7 @@ public:
* Checks if directory entry is available.
*/
bool HasEntry() const {
- assert(!Failed());
+ assert(!HasFailed());
return ent != nullptr;
}
@@ -70,7 +70,7 @@ public:
* Reads next directory entry.
*/
bool ReadEntry() {
- assert(!Failed());
+ assert(!HasFailed());
ent = readdir(dirp);
return HasEntry();
}