Index: scripts/jenkins/run-cppcheck.bat =================================================================== diff -u -r44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 --- scripts/jenkins/run-cppcheck.bat (.../run-cppcheck.bat) (revision 44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d) +++ scripts/jenkins/run-cppcheck.bat (.../run-cppcheck.bat) (revision 5446395d3925e49d3e4cba82044bdfd4dffb6ee9) @@ -5,4 +5,4 @@ mkdir "%WORKSPACE%\CPPCheck" -cppcheck --enable=warning,style,performance,portability,information,unusedFunction --suppress=cstyleCast --library=microsoft_sal.cfg --library=windows.cfg --std=c++11 --xml-version=2 --xml --platform=win32W --force src 2>"%WORKSPACE%\CPPCheck\cppcheck.xml" +cppcheck --enable=warning,style,performance,portability,information,unusedFunction --suppress=cstyleCast --inline-suppr --library=microsoft_sal.cfg --library=windows.cfg --std=c++11 --xml-version=2 --xml --platform=win32W --force src 2>"%WORKSPACE%\CPPCheck\cppcheck.xml" Index: src/libchcore/TDateTime.h =================================================================== diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 --- src/libchcore/TDateTime.h (.../TDateTime.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3) +++ src/libchcore/TDateTime.h (.../TDateTime.h) (revision 5446395d3925e49d3e4cba82044bdfd4dffb6ee9) @@ -35,8 +35,11 @@ public: TDateTime(); TDateTime(int iYear, int iMonth, int iDay, int iHour, int iMinute, int iSecond); + // cppcheck-suppress noExplicitConstructor TDateTime(FILETIME ftDateTime); + // cppcheck-suppress noExplicitConstructor TDateTime(SYSTEMTIME sysDateTime); + // cppcheck-suppress noExplicitConstructor TDateTime(time_t tDateTime); TDateTime& operator=(FILETIME ftDateTime); Fisheye: Tag 5446395d3925e49d3e4cba82044bdfd4dffb6ee9 refers to a dead (removed) revision in file `src/libchcore/TFakeFileDescription.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5446395d3925e49d3e4cba82044bdfd4dffb6ee9 refers to a dead (removed) revision in file `src/libchcore/TFakeFileDescription.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5446395d3925e49d3e4cba82044bdfd4dffb6ee9 refers to a dead (removed) revision in file `src/libchcore/TFakeFilesystem.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5446395d3925e49d3e4cba82044bdfd4dffb6ee9 refers to a dead (removed) revision in file `src/libchcore/TFakeFilesystem.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5446395d3925e49d3e4cba82044bdfd4dffb6ee9 refers to a dead (removed) revision in file `src/libchcore/TFakeFilesystemFile.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5446395d3925e49d3e4cba82044bdfd4dffb6ee9 refers to a dead (removed) revision in file `src/libchcore/TFakeFilesystemFile.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5446395d3925e49d3e4cba82044bdfd4dffb6ee9 refers to a dead (removed) revision in file `src/libchcore/TFakeFilesystemFind.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5446395d3925e49d3e4cba82044bdfd4dffb6ee9 refers to a dead (removed) revision in file `src/libchcore/TFakeFilesystemFind.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5446395d3925e49d3e4cba82044bdfd4dffb6ee9 refers to a dead (removed) revision in file `src/libchcore/TFakeVolumeInfo.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5446395d3925e49d3e4cba82044bdfd4dffb6ee9 refers to a dead (removed) revision in file `src/libchcore/TFakeVolumeInfo.h'. Fisheye: No comparison available. Pass `N' to diff? Index: src/libchcore/TFileTime.h =================================================================== diff -u -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 --- src/libchcore/TFileTime.h (.../TFileTime.h) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3) +++ src/libchcore/TFileTime.h (.../TFileTime.h) (revision 5446395d3925e49d3e4cba82044bdfd4dffb6ee9) @@ -27,6 +27,7 @@ { public: TFileTime(); + // cppcheck-suppress noExplicitConstructor TFileTime(const FILETIME& rftTime); TFileTime(const TFileTime& rSrc); ~TFileTime(); Index: src/libchcore/TString.h =================================================================== diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 --- src/libchcore/TString.h (.../TString.h) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae) +++ src/libchcore/TString.h (.../TString.h) (revision 5446395d3925e49d3e4cba82044bdfd4dffb6ee9) @@ -45,6 +45,7 @@ /** \name Construction/destruction */ /*@{*/ TString(); ///< Standard constructor + // cppcheck-suppress noExplicitConstructor TString(const wchar_t* pszStr); ///< Constructor that takes const wchar_t* as an initial TString TString(const wchar_t* pszStart, const wchar_t* pszEnd, size_t stMaxStringSize = DefaultMaxStringSize); TString(const wchar_t* pszStart, size_t stCount); Index: src/libchcore/libchcore.vc140.vcxproj =================================================================== diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 --- src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae) +++ src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision 5446395d3925e49d3e4cba82044bdfd4dffb6ee9) @@ -481,12 +481,7 @@ <ClInclude Include="TCoreStdException.h" /> <ClInclude Include="TCoreWin32Exception.h" /> <ClInclude Include="TEvent.h" /> - <ClInclude Include="TFakeFileDescription.h" /> <ClInclude Include="TFakeFileSerializer.h" /> - <ClInclude Include="TFakeFilesystem.h" /> - <ClInclude Include="TFakeFilesystemFile.h" /> - <ClInclude Include="TFakeFilesystemFind.h" /> - <ClInclude Include="TFakeVolumeInfo.h" /> <ClInclude Include="TFeedbackHandlerBase.h" /> <ClInclude Include="TFeedbackHandlerWrapper.h" /> <ClInclude Include="TFeedbackResult.h" /> @@ -719,12 +714,7 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="TEvent.cpp" /> - <ClCompile Include="TFakeFileDescription.cpp" /> <ClCompile Include="TFakeFileSerializer.cpp" /> - <ClCompile Include="TFakeFilesystem.cpp" /> - <ClCompile Include="TFakeFilesystemFile.cpp" /> - <ClCompile Include="TFakeFilesystemFind.cpp" /> - <ClCompile Include="TFakeVolumeInfo.cpp" /> <ClCompile Include="TFeedbackResult.cpp" /> <ClCompile Include="TFilesystemFeedbackWrapper.cpp" /> <ClCompile Include="TFeedbackHandlerBase.cpp" /> Index: src/libchcore/libchcore.vc140.vcxproj.filters =================================================================== diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 --- src/libchcore/libchcore.vc140.vcxproj.filters (.../libchcore.vc140.vcxproj.filters) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae) +++ src/libchcore/libchcore.vc140.vcxproj.filters (.../libchcore.vc140.vcxproj.filters) (revision 5446395d3925e49d3e4cba82044bdfd4dffb6ee9) @@ -72,9 +72,6 @@ <Filter Include="Source Files\Filesystems\Local"> <UniqueIdentifier>{3de9b5f5-44fa-4e4b-9a63-f93d940d537a}</UniqueIdentifier> </Filter> - <Filter Include="Source Files\Filesystems\Fake"> - <UniqueIdentifier>{bb686013-810c-4180-9b23-c5fe52df7c93}</UniqueIdentifier> - </Filter> <Filter Include="Source Files\Tools\Exceptions"> <UniqueIdentifier>{a77c6575-b7b7-4683-9295-d5173da8c76b}</UniqueIdentifier> </Filter> @@ -422,24 +419,9 @@ <ClInclude Include="TLocalFilesystemFind.h"> <Filter>Source Files\Filesystems\Local</Filter> </ClInclude> - <ClInclude Include="TFakeFilesystem.h"> - <Filter>Source Files\Filesystems\Fake</Filter> - </ClInclude> - <ClInclude Include="TFakeFilesystemFile.h"> - <Filter>Source Files\Filesystems\Fake</Filter> - </ClInclude> - <ClInclude Include="TFakeFilesystemFind.h"> - <Filter>Source Files\Filesystems\Fake</Filter> - </ClInclude> - <ClInclude Include="TFakeFileDescription.h"> - <Filter>Source Files\Filesystems\Fake</Filter> - </ClInclude> <ClInclude Include="TSparseRangeMap.h"> <Filter>Source Files\Tools</Filter> </ClInclude> - <ClInclude Include="TFakeVolumeInfo.h"> - <Filter>Source Files\Filesystems\Fake</Filter> - </ClInclude> <ClInclude Include="SerializerDataTypes.h"> <Filter>Source Files\Tools</Filter> </ClInclude> @@ -829,27 +811,12 @@ <ClCompile Include="TLocalFilesystemFind.cpp"> <Filter>Source Files\Filesystems\Local</Filter> </ClCompile> - <ClCompile Include="TFakeFilesystem.cpp"> - <Filter>Source Files\Filesystems\Fake</Filter> - </ClCompile> - <ClCompile Include="TFakeFilesystemFile.cpp"> - <Filter>Source Files\Filesystems\Fake</Filter> - </ClCompile> - <ClCompile Include="TFakeFilesystemFind.cpp"> - <Filter>Source Files\Filesystems\Fake</Filter> - </ClCompile> - <ClCompile Include="TFakeFileDescription.cpp"> - <Filter>Source Files\Filesystems\Fake</Filter> - </ClCompile> <ClCompile Include="TSparseRangeMap.cpp"> <Filter>Source Files\Tools</Filter> </ClCompile> <ClCompile Include="Tests\TestsTSparseRangeMap.cpp"> <Filter>Tests</Filter> </ClCompile> - <ClCompile Include="TFakeVolumeInfo.cpp"> - <Filter>Source Files\Filesystems\Fake</Filter> - </ClCompile> <ClCompile Include="TBaseException.cpp"> <Filter>Source Files\Tools\Exceptions</Filter> </ClCompile> Index: src/libictranslate/crc32.cpp =================================================================== diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 --- src/libictranslate/crc32.cpp (.../crc32.cpp) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae) +++ src/libictranslate/crc32.cpp (.../crc32.cpp) (revision 5446395d3925e49d3e4cba82044bdfd4dffb6ee9) @@ -119,41 +119,3 @@ return dwCRC; } - -/** Starts to calculate a crc32 checksum. - * \param[out] puiValue - a pointer to the unsigned int variable that will be used to process the crc checksum. - */ -void crc32_begin(unsigned int *puiValue) -{ - assert(puiValue != NULL); - if(!puiValue) - throw std::runtime_error("Invalid argument"); - - *puiValue=0xffffffff; -} - -/** Continues to calculate a crc32 checksum. May be called many times sequentially to calc the checksum - * of a very large buffer. - * \param[in/out] puiPrev - a previous value calculated - * \param[in] pbyData - pointer to a buffer with data which checksum is to be calculated - * \param[in] tLen - length of the data in a buffer - */ -void crc32_partial(unsigned int *puiPrev, const char *pbyData, size_t tLen) -{ - assert(puiPrev && pbyData); - if(!puiPrev || !pbyData) - throw std::runtime_error("Invalid argument"); - - for (size_t i=0;i<tLen;i++) - __crc32partial(pbyData[i], puiPrev); -} - -/** Finished calculating a checksum. - * \param[in/out] puiValue - ptr to the variable with a crc32 value calculated so far - */ -void crc32_finish(const unsigned int* puiValue) -{ - puiValue; - assert(puiValue); - return; -} Index: src/libictranslate/crc32.h =================================================================== diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 --- src/libictranslate/crc32.h (.../crc32.h) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae) +++ src/libictranslate/crc32.h (.../crc32.h) (revision 5446395d3925e49d3e4cba82044bdfd4dffb6ee9) @@ -27,8 +27,4 @@ /// Calculates crc32 checksum for a given data unsigned int crc32(const char* pbyData, size_t tLen); -void crc32_begin(unsigned int *puiValue); -void crc32_partial(unsigned int *puiPrev, const char *pbyData, size_t tLen); -void crc32_finish(const unsigned int* puiValue); - #endif Index: src/rc2lng/rc.cpp =================================================================== diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 --- src/rc2lng/rc.cpp (.../rc.cpp) (revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae) +++ src/rc2lng/rc.cpp (.../rc.cpp) (revision 5446395d3925e49d3e4cba82044bdfd4dffb6ee9) @@ -72,7 +72,7 @@ if(str.Find(_T("x")) != -1) { // hex2dec - if(_stscanf(str, _T("%lx"), &iID) != 1) + if(_stscanf(str, _T("%x"), &iID) != 1) { CStringA strText; strText.Format("%s(%ld) : Error: Cannot parse hex number in line:\n%s", pszFile, lLineNo, m_pszBuffer); @@ -291,7 +291,7 @@ // put the found ID as output text CString out; - out.Format(_T("\"%lu\""), uiID); + out.Format(_T("\"%u\""), uiID); str=str.Left(iPos)+out; } else Index: tools/rc2lng.exe =================================================================== diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 Binary files differ Index: tools/test_runner32.exe =================================================================== diff -u -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae -r5446395d3925e49d3e4cba82044bdfd4dffb6ee9 Binary files differ