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

qmake: simplify file-reading loop in findMocs

Browse Source 
Change-Id: If436215c6041551782750f107021fcccbd447b32
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Edward Welbourne 2015-12-09 14:37:11 +01:00
parent 5e7492325a
commit 935ddbd3a2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/generators/makefiledeps.cpp
View File

@ -872,7 +872,7 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file)
files_changed = true; files_changed = true;
file->moc_checked = true; file->moc_checked = true;
int buffer_len; int buffer_len = 0;
char *buffer = 0; char *buffer = 0;
{ {
struct stat fst; struct stat fst;
@ -890,9 +890,9 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file)
return false; //shouldn't happen return false; //shouldn't happen
} }
buffer = getBuffer(fst.st_size); buffer = getBuffer(fst.st_size);
for(int have_read = buffer_len = 0; while (int have_read = QT_READ(fd, buffer + buffer_len, fst.st_size - buffer_len))
(have_read = QT_READ(fd, buffer + buffer_len, fst.st_size - buffer_len)); buffer_len += have_read;
buffer_len += have_read) ;
QT_CLOSE(fd); QT_CLOSE(fd);
} }