1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFSFileEngine: fix logic

Browse Source 
Inside the do-while loop the if body is executed if `eof` is true, which
means the continue statement is redundant because the while loop
condition contains `!eof`, so the do-while body doesn't get executed
again after that.

Change-Id: If0685eb482f29b88e9c8660886392483a3bd75ec
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2023-09-08 01:30:26 +03:00
parent 3fbcf53828
commit 1849489315
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/io/qfsfileengine.cpp
View File

@ -621,17 +621,15 @@ qint64 QFSFileEnginePrivate::readFdFh(char *data, qint64 len)
// Buffered stdlib mode. // Buffered stdlib mode.
size_t result; size_t result;
bool retry = true;
do { do {
result = fread(data + readBytes, 1, size_t(len - readBytes), fh); result = fread(data + readBytes, 1, size_t(len - readBytes), fh);
eof = feof(fh); eof = feof(fh);
if (retry && eof && result == 0) { if (eof && result == 0) {
// On OS X, this is needed, e.g., if a file was written to // On OS X, this is needed, e.g., if a file was written to
// through another stream since our last read. See test // through another stream since our last read. See test
// tst_QFile::appendAndRead // tst_QFile::appendAndRead
QT_FSEEK(fh, QT_FTELL(fh), SEEK_SET); // re-sync stream. QT_FSEEK(fh, QT_FTELL(fh), SEEK_SET); // re-sync stream.
retry = false; break;
continue;
} }
readBytes += result; readBytes += result;
} while (!eof && (result == 0 ? errno == EINTR : readBytes < len)); } while (!eof && (result == 0 ? errno == EINTR : readBytes < len));