aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Krjuchkov <denis@crazydev.net>2013-05-05 13:34:12 +0600
committerDenis Krjuchkov <denis@crazydev.net>2013-05-05 13:34:12 +0600
commit896015bf533c6bbca3026f6d47400d7241a3935a (patch)
tree108f887726f2ee4d105f26103d22e2f276bccc9a
parentdf3e7a9248c6e896329385a6c5677fe9a5f69c6f (diff)
downloadmpd-896015bf533c6bbca3026f6d47400d7241a3935a.tar.gz
mpd-896015bf533c6bbca3026f6d47400d7241a3935a.tar.xz
mpd-896015bf533c6bbca3026f6d47400d7241a3935a.zip
DirectoryReader: rename Failed() to HasFailed() for consistency with TextFile
-rw-r--r--src/Mapper.cxx2
-rw-r--r--src/fs/DirectoryReader.hxx8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Mapper.cxx b/src/Mapper.cxx
index 559df0d23..40e762e4b 100644
--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -100,7 +100,7 @@ check_directory(const char *path_utf8, const Path &path_fs)
#endif
const DirectoryReader reader(path_fs);
- if (reader.Failed() && errno == EACCES)
+ if (reader.HasFailed() && errno == EACCES)
g_warning("No permission to read directory: %s", path_utf8);
}
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();
}