From 23ffb9d452397b3ca1742854ebbeeeb305b98bc4 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 18 Jan 2015 17:34:34 +0100 Subject: + More paratemer checking to make nitpickers happy --- src/SFileExtractFile.cpp | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'src/SFileExtractFile.cpp') diff --git a/src/SFileExtractFile.cpp b/src/SFileExtractFile.cpp index 314d8ff..cabde49 100644 --- a/src/SFileExtractFile.cpp +++ b/src/SFileExtractFile.cpp @@ -34,26 +34,23 @@ bool WINAPI SFileExtractFile(HANDLE hMpq, const char * szToExtract, const TCHAR } // Copy the file's content - if(nError == ERROR_SUCCESS) + while(nError == ERROR_SUCCESS) { char szBuffer[0x1000]; - DWORD dwTransferred; + DWORD dwTransferred = 0; - for(;;) - { - // dwTransferred is only set to nonzero if something has been read. - // nError can be ERROR_SUCCESS or ERROR_HANDLE_EOF - if(!SFileReadFile(hMpqFile, szBuffer, sizeof(szBuffer), &dwTransferred, NULL)) - nError = GetLastError(); - if(nError == ERROR_HANDLE_EOF) - nError = ERROR_SUCCESS; - if(dwTransferred == 0) - break; + // dwTransferred is only set to nonzero if something has been read. + // nError can be ERROR_SUCCESS or ERROR_HANDLE_EOF + if(!SFileReadFile(hMpqFile, szBuffer, sizeof(szBuffer), &dwTransferred, NULL)) + nError = GetLastError(); + if(nError == ERROR_HANDLE_EOF) + nError = ERROR_SUCCESS; + if(dwTransferred == 0) + break; - // If something has been actually read, write it - if(!FileStream_Write(pLocalFile, NULL, szBuffer, dwTransferred)) - nError = GetLastError(); - } + // If something has been actually read, write it + if(!FileStream_Write(pLocalFile, NULL, szBuffer, dwTransferred)) + nError = GetLastError(); } // Close the files -- cgit v1.2.3