diff options
Diffstat (limited to 'Source/Core/Common/Src/FileSearch.cpp')
| -rw-r--r-- | Source/Core/Common/Src/FileSearch.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Source/Core/Common/Src/FileSearch.cpp b/Source/Core/Common/Src/FileSearch.cpp index 94ae687821..36eb3d0536 100644 --- a/Source/Core/Common/Src/FileSearch.cpp +++ b/Source/Core/Common/Src/FileSearch.cpp @@ -74,17 +74,13 @@ void CFileSearch::FindFiles(const std::string& _searchString, const std::string& size_t dot_pos = _searchString.rfind("."); if (dot_pos == std::string::npos) - { return; - } std::string ext = _searchString.substr(dot_pos); DIR* dir = opendir(_strPath.c_str()); if (!dir) - { return; - } dirent* dp; @@ -93,19 +89,17 @@ void CFileSearch::FindFiles(const std::string& _searchString, const std::string& dp = readdir(dir); if (!dp) - { break; - } std::string s(dp->d_name); if ( (s.size() > ext.size()) && (!strcasecmp(s.substr(s.size() - ext.size()).c_str(), ext.c_str())) ) { - std::string full_name; - if (_strPath.c_str()[_strPath.size()-1] == DIR_SEP_CHR) - full_name = _strPath + s; - else - full_name = _strPath + DIR_SEP + s; + std::string full_name; + if (_strPath.c_str()[_strPath.size()-1] == DIR_SEP_CHR) + full_name = _strPath + s; + else + full_name = _strPath + DIR_SEP + s; m_FileNames.push_back(full_name); } @@ -118,5 +112,5 @@ void CFileSearch::FindFiles(const std::string& _searchString, const std::string& const CFileSearch::XStringVector& CFileSearch::GetFileNames() const { - return(m_FileNames); + return m_FileNames; } |