AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QDirIterator: move a guard condition from caller to callee

Browse Source 
The private pushDirectory() method is only called from the
QDirIterator ctor and from checkAndPushDirectory(). Moving the loop
check from checkAndPushDirectory() to pushDirectory() therefore
doesn't change anything, since, for the ctor case, it will always
fail.

This is preparation of using QDuplicateTracker for `visitedLinks`.

Change-Id: I609934002dabebf0a3e7a516b8398eae7db770d5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2020-05-02 22:59:54 +02:00
parent e62f6ffcb3
commit 1ba42c10bb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/io/qdiriterator.cpp
View File

@ -210,6 +210,10 @@ void QDirIteratorPrivate::pushDirectory(const QFileInfo &fileInfo)
path = fileInfo.canonicalFilePath(); path = fileInfo.canonicalFilePath();
#endif #endif
// Stop link loops
if (visitedLinks.contains(fileInfo.canonicalFilePath()))
return;
if (iteratorFlags & QDirIterator::FollowSymlinks) if (iteratorFlags & QDirIterator::FollowSymlinks)
visitedLinks << fileInfo.canonicalFilePath(); visitedLinks << fileInfo.canonicalFilePath();
@ -318,10 +322,6 @@ void QDirIteratorPrivate::checkAndPushDirectory(const QFileInfo &fileInfo)
if (!(filters & QDir::AllDirs) && !(filters & QDir::Hidden) && fileInfo.isHidden()) if (!(filters & QDir::AllDirs) && !(filters & QDir::Hidden) && fileInfo.isHidden())
return; return;
// Stop link loops
if (visitedLinks.contains(fileInfo.canonicalFilePath()))
return;
pushDirectory(fileInfo); pushDirectory(fileInfo);
} }