diff options
| author | Ladislav Zezula <ladislav.zezula@avg.com> | 2014-01-13 12:25:48 +0100 |
|---|---|---|
| committer | Ladislav Zezula <ladislav.zezula@avg.com> | 2014-01-13 12:25:48 +0100 |
| commit | 8fa3f25f3e2654bfc1d4ff9caa0b9c849b8ee514 (patch) | |
| tree | 8a9090d1f9924d8fbf02ab6bdea3e086553d22ff /test | |
| parent | a70a9800220851555272cab6a61e2bb00b867ffb (diff) | |
+ Removed warnings from MINGW
+ Fixed Win32 makefile
Diffstat (limited to 'test')
| -rw-r--r-- | test/TLogHelper.cpp | 2 | ||||
| -rw-r--r-- | test/Test.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/test/TLogHelper.cpp b/test/TLogHelper.cpp index 1e0c787..6876637 100644 --- a/test/TLogHelper.cpp +++ b/test/TLogHelper.cpp @@ -287,7 +287,7 @@ int TLogHelper::PrintWithClreol(const char * szFormat, va_list argList, bool bPr bMessagePrinted = true; // Spit out the text in one single printf - printf("%s", szMessage, 0); + printf("%s", szMessage); return nError; } diff --git a/test/Test.cpp b/test/Test.cpp index 25f63fb..7c50b4b 100644 --- a/test/Test.cpp +++ b/test/Test.cpp @@ -2820,7 +2820,7 @@ static int TestCreateArchive_FillArchive(const char * szPlainName) // Now we should be able to add 6 files if(nError == ERROR_SUCCESS) { - for(DWORD i = 0; i < dwMaxFileCount; i++) + for(unsigned int i = 0; i < dwMaxFileCount; i++) { sprintf(szFileName, "AddedFile%03u.txt", i); nError = AddFileToMpq(&Logger, hMpq, szFileName, szFileData, dwFlags, dwCompression); @@ -2922,7 +2922,7 @@ static int TestCreateArchive_IncMaxFileCount(const char * szPlainName) // we increment the max file count if(nError == ERROR_SUCCESS) { - for(DWORD i = 0; i < 10; i++) + for(unsigned int i = 0; i < 10; i++) { // Open the archive again nError = OpenExistingArchiveWithCopy(&Logger, NULL, szPlainName, &hMpq); @@ -3154,7 +3154,6 @@ static int TestCreateArchive_CompressionsTest(const char * szPlainName) DWORD dwCmprCount = sizeof(Compressions) / sizeof(DWORD); DWORD dwAddedFiles = 0; DWORD dwFoundFiles = 0; - DWORD i; int nError; // Create paths for local file to be added @@ -3167,7 +3166,7 @@ static int TestCreateArchive_CompressionsTest(const char * szPlainName) if(nError == ERROR_SUCCESS) { Logger.UserTotal = dwCmprCount; - for(i = 0; i < dwCmprCount; i++) + for(unsigned int i = 0; i < dwCmprCount; i++) { sprintf(szArchivedName, "WaveFile_%02u.wav", i + 1); nError = AddLocalFileToMpq(&Logger, hMpq, szArchivedName, szFileName, MPQ_FILE_COMPRESS | MPQ_FILE_ENCRYPTED | MPQ_FILE_SECTOR_CRC, Compressions[i]); |