From 80b6aa588bea456bad4b9b753bac554f1633b01f Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 7 Sep 2015 19:34:55 +0100 Subject: [PATCH] empty() public on DirectoryStream --- ostd/filesystem.hh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ostd/filesystem.hh b/ostd/filesystem.hh index 84358c1..ea6e1a4 100644 --- a/ostd/filesystem.hh +++ b/ostd/filesystem.hh @@ -277,6 +277,10 @@ struct DirectoryStream { return true; } + bool empty() const { + return !p_de; + } + FileInfo read() { if (!pop_front()) return FileInfo(); @@ -292,19 +296,14 @@ struct DirectoryStream { DirectoryRange iter(); private: - bool empty() const { - return !p_de; - } - static bool pop_front(DIR *d, struct dirent *dev, struct dirent **de) { if (!d) return false; if (readdir_r(d, dev, de)) return false; while (*de && (!strcmp((*de)->d_name, ".") || - !strcmp((*de)->d_name, ".."))) { + !strcmp((*de)->d_name, ".."))) if (readdir_r(d, dev, de)) return false; - } return !!*de; }