walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed #4612 (Adding file extensions to Cppcheck analysis)

This commit is contained in:
Daniel Marjamäki 2013-03-03 07:32:14 +01:00
parent d49f4a611a
commit d8fc126cf0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cli/filelister.cpp
View File

@ -78,7 +78,10 @@ void FileLister::recursiveAddFiles(std::map<std::string, std::size_t> &files, co
// searchPattern is the search string passed into FindFirst and FindNext. // searchPattern is the search string passed into FindFirst and FindNext.
std::string searchPattern = cleanedPath; std::string searchPattern = cleanedPath;
if (MyIsDirectory(cleanedPath)) { // The user wants to check all files in a dir
const bool checkAllFilesInDir = (MyIsDirectory(cleanedPath) != FALSE);
if (checkAllFilesInDir) {
char c = cleanedPath[ cleanedPath.size()-1 ]; char c = cleanedPath[ cleanedPath.size()-1 ];
switch (c) { switch (c) {
case '\\': case '\\':
@ -120,12 +123,14 @@ void FileLister::recursiveAddFiles(std::map<std::string, std::size_t> &files, co
// File // File
const std::string nativename = Path::fromNativeSeparators(fname); const std::string nativename = Path::fromNativeSeparators(fname);
// Limitation: file sizes are assumed to fit in a 'size_t' if (!checkAllFilesInDir || Path::acceptFile(fname)) {
// Limitation: file sizes are assumed to fit in a 'size_t'
#ifdef _WIN64 #ifdef _WIN64
files[nativename] = (static_cast<std::size_t>(ffd.nFileSizeHigh) << 32) | ffd.nFileSizeLow; files[nativename] = (static_cast<std::size_t>(ffd.nFileSizeHigh) << 32) | ffd.nFileSizeLow;
#else #else
files[nativename] = ffd.nFileSizeLow; files[nativename] = ffd.nFileSizeLow;
#endif #endif
}
} else { } else {
// Directory // Directory
FileLister::recursiveAddFiles(files, fname); FileLister::recursiveAddFiles(files, fname);