diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp index a587b0660..0c772c0d0 100644 --- a/lib/base/utility.cpp +++ b/lib/base/utility.cpp @@ -418,7 +418,7 @@ bool Utility::Glob(const String& pathSpec, const boost::function& callback, int type) +bool Utility::GlobRecursive(const String& path, const String& pattern, const boost::function& callback, int type) { #ifdef _WIN32 HANDLE handle; @@ -463,8 +463,6 @@ void Utility::GlobRecursive(const String& path, const String& pattern, const boo << boost::errinfo_api_function("FindClose") << errinfo_win32_error(GetLastError())); } - - return true; #else /* _WIN32 */ DIR *dirp; @@ -521,6 +519,8 @@ void Utility::GlobRecursive(const String& path, const String& pattern, const boo callback(cpath); } #endif /* _WIN32 */ + + return true; } #ifndef _WIN32 diff --git a/lib/base/utility.h b/lib/base/utility.h index d1c5f4a76..ba070a6af 100644 --- a/lib/base/utility.h +++ b/lib/base/utility.h @@ -76,7 +76,7 @@ public: static String NewUniqueID(void); static bool Glob(const String& pathSpec, const boost::function& callback, int type = GlobFile | GlobDirectory); - static void GlobRecursive(const String& path, const String& pattern, const boost::function& callback, int type = GlobFile | GlobDirectory); + static bool GlobRecursive(const String& path, const String& pattern, const boost::function& callback, int type = GlobFile | GlobDirectory); static void QueueAsyncCallback(const boost::function& callback);