From 91f505eae923bdba9cdf6961b0f25e6d79a4d957 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Tue, 16 Nov 2004 06:15:19 +0000 Subject: Per code review: * Clean up the StatusInfo constructor to construct all members and give them reasonable values. * Get rid of the Vector typedef and make the interface to getDirectoryContent use a std::set instead of a std::vector so the dir content is sorted. * Make the getStatusInfo method const and not return a useless boolean. llvm-svn: 17872 --- llvm/lib/System/Unix/Path.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'llvm/lib/System/Unix/Path.cpp') diff --git a/llvm/lib/System/Unix/Path.cpp b/llvm/lib/System/Unix/Path.cpp index d2ba0f90359..55ef6669ee3 100644 --- a/llvm/lib/System/Unix/Path.cpp +++ b/llvm/lib/System/Unix/Path.cpp @@ -239,10 +239,8 @@ Path::getLast() const { return path.substr(pos+1); } -bool -Path::getStatusInfo(StatusInfo& info) { - if (!isFile() || !readable()) - return false; +void +Path::getStatusInfo(StatusInfo& info) const { struct stat buf; if (0 != stat(path.c_str(), &buf)) { ThrowErrno(std::string("Can't get status: ")+path); @@ -255,11 +253,10 @@ Path::getStatusInfo(StatusInfo& info) { info.isDir = S_ISDIR(buf.st_mode); if (info.isDir && path[path.length()-1] != '/') path += '/'; - return true; } bool -Path::getDirectoryContents(Vector& result) const { +Path::getDirectoryContents(std::set& result) const { if (!isDirectory()) return false; DIR* direntries = ::opendir(path.c_str()); @@ -276,7 +273,7 @@ Path::getDirectoryContents(Vector& result) const { ThrowErrno(aPath.path + ": can't get status"); if (S_ISDIR(buf.st_mode)) aPath.path += "/"; - result.push_back(aPath); + result.insert(aPath); } de = ::readdir(direntries); } -- cgit v1.2.3