Mercurial > hg > orthanc
changeset 6686:b20a48627847
preparing for cppcheck 2.20.0
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 13 Apr 2026 10:04:36 +0200 |
| parents | 0e54f5c3f43b |
| children | 3412a4b8fb04 |
| files | OrthancFramework/Sources/DicomParsing/DicomDirWriter.cpp OrthancFramework/Sources/SQLite/Connection.cpp OrthancFramework/Sources/SQLite/FunctionContext.cpp OrthancFramework/Sources/SQLite/Statement.cpp OrthancFramework/Sources/SQLite/StatementReference.cpp OrthancServer/Resources/RunCppCheck-2.1.sh OrthancServer/Resources/RunCppCheck-2.17.0.sh OrthancServer/Resources/RunCppCheck-2.17.1.sh OrthancServer/Resources/RunCppCheck-2.20.0.sh |
| diffstat | 9 files changed, 136 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomParsing/DicomDirWriter.cpp Mon Apr 13 08:46:24 2026 +0200 +++ b/OrthancFramework/Sources/DicomParsing/DicomDirWriter.cpp Mon Apr 13 10:04:36 2026 +0200 @@ -110,8 +110,8 @@ #include <dcmtk/dcmdata/dcvrui.h> #include <dcmtk/dcmdata/dcsequen.h> #include <dcmtk/dcmdata/dcostrmf.h> -#include "dcmtk/dcmdata/dcvrda.h" /* for class DcmDate */ -#include "dcmtk/dcmdata/dcvrtm.h" /* for class DcmTime */ +#include <dcmtk/dcmdata/dcvrda.h> /* for class DcmDate */ +#include <dcmtk/dcmdata/dcvrtm.h> /* for class DcmTime */ #include <memory>
--- a/OrthancFramework/Sources/SQLite/Connection.cpp Mon Apr 13 08:46:24 2026 +0200 +++ b/OrthancFramework/Sources/SQLite/Connection.cpp Mon Apr 13 10:04:36 2026 +0200 @@ -53,7 +53,7 @@ #include "../Logging.h" #endif -#include "sqlite3.h" +#include <sqlite3.h> namespace Orthanc
--- a/OrthancFramework/Sources/SQLite/FunctionContext.cpp Mon Apr 13 08:46:24 2026 +0200 +++ b/OrthancFramework/Sources/SQLite/FunctionContext.cpp Mon Apr 13 10:04:36 2026 +0200 @@ -45,7 +45,7 @@ #include <cassert> #include <string> -#include "sqlite3.h" +#include <sqlite3.h> namespace Orthanc {
--- a/OrthancFramework/Sources/SQLite/Statement.cpp Mon Apr 13 08:46:24 2026 +0200 +++ b/OrthancFramework/Sources/SQLite/Statement.cpp Mon Apr 13 10:04:36 2026 +0200 @@ -66,7 +66,7 @@ # define LOG_APPLY(message); // CLOG(TRACE, SQLITE) << "SQLite::Statement apply: " << message; #endif -#include "sqlite3.h" +#include <sqlite3.h> #if defined(_MSC_VER) #define snprintf _snprintf
--- a/OrthancFramework/Sources/SQLite/StatementReference.cpp Mon Apr 13 08:46:24 2026 +0200 +++ b/OrthancFramework/Sources/SQLite/StatementReference.cpp Mon Apr 13 10:04:36 2026 +0200 @@ -51,7 +51,7 @@ #include <string> #include <cassert> -#include "sqlite3.h" +#include <sqlite3.h> namespace Orthanc {
--- a/OrthancServer/Resources/RunCppCheck-2.1.sh Mon Apr 13 08:46:24 2026 +0200 +++ b/OrthancServer/Resources/RunCppCheck-2.1.sh Mon Apr 13 10:04:36 2026 +0200 @@ -10,6 +10,12 @@ fi cat <<EOF > /tmp/cppcheck-suppressions.txt +assertWithSideEffect:../../OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp:1026 +assertWithSideEffect:../../OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp:277 +assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:292 +assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:391 +assertWithSideEffect:../../OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp:3077 +assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:287 constParameter:../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp knownArgument:../../OrthancFramework/UnitTestsSources/ImageTests.cpp knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp @@ -18,26 +24,19 @@ stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:166 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:74 stlFindInsert:../../OrthancServer/Sources/Database/MainDicomTagsRegistry.cpp:65 -stlFindInsert:../../OrthancServer/Sources/OrthancWebDav.cpp:328 -stlFindInsert:../../OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp:41 -stlFindInsert:../../OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp:191 -stlFindInsert:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:361 +stlFindInsert:../../OrthancServer/Sources/Database/ResourcesContent.h:141 +stlFindInsert:../../OrthancServer/Sources/OrthancWebDav.cpp:329 +stlFindInsert:../../OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp:42 +stlFindInsert:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:362 +stlFindInsert:../../OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp:192 syntaxError:../../OrthancFramework/Sources/SQLite/FunctionContext.h:53 syntaxError:../../OrthancFramework/UnitTestsSources/DicomMapTests.cpp:74 -syntaxError:../../OrthancFramework/UnitTestsSources/ZipTests.cpp:133 syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:325 unreadVariable:../../OrthancFramework/Sources/FileStorage/StorageAccessor.cpp unreadVariable:../../OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp:1173 useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:91 useInitializationList:../../OrthancFramework/Sources/Images/PngWriter.cpp:99 useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:275 -assertWithSideEffect:../../OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp:277 -assertWithSideEffect:../../OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp:1026 -assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:292 -assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:391 -assertWithSideEffect:../../OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp:3068 -assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:286 -assertWithSideEffect:../../OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp:454 EOF CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-2.1/ @@ -85,6 +84,7 @@ -DORTHANC_SANDBOXED=0 \ -DORTHANC_SQLITE_VERSION=3027001 \ -DORTHANC_UNIT_TESTS_LINK_FRAMEWORK=1 \ + -DORTHANC_USE_SYSTEM_MINIZIP=0 \ -DPUGIXML_VERSION=150 \ -DUNIT_TESTS_WITH_HTTP_CONNEXIONS=1 \ -D__BYTE_ORDER=__LITTLE_ENDIAN \
--- a/OrthancServer/Resources/RunCppCheck-2.17.0.sh Mon Apr 13 08:46:24 2026 +0200 +++ b/OrthancServer/Resources/RunCppCheck-2.17.0.sh Mon Apr 13 10:04:36 2026 +0200 @@ -10,6 +10,13 @@ fi cat <<EOF > /tmp/cppcheck-suppressions.txt +assertWithSideEffect:../../OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp:454 +assertWithSideEffect:../../OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp:1026 +assertWithSideEffect:../../OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp:277 +assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:292 +assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:391 +assertWithSideEffect:../../OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp:3058 +assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:286 nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:322 stlFindInsert:../../OrthancFramework/Sources/DicomFormat/DicomMap.cpp:1525 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:166 @@ -17,8 +24,8 @@ stlFindInsert:../../OrthancServer/Sources/Database/MainDicomTagsRegistry.cpp:65 stlFindInsert:../../OrthancServer/Sources/OrthancWebDav.cpp:328 stlFindInsert:../../OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp:41 +stlFindInsert:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:361 stlFindInsert:../../OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp:191 -stlFindInsert:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:361 syntaxError:../../OrthancFramework/Sources/SQLite/FunctionContext.h:53 syntaxError:../../OrthancFramework/UnitTestsSources/DicomMapTests.cpp:74 syntaxError:../../OrthancFramework/UnitTestsSources/ZipTests.cpp:133 @@ -28,16 +35,9 @@ useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:91 useInitializationList:../../OrthancFramework/Sources/Images/PngWriter.cpp:99 useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:275 -assertWithSideEffect:../../OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp:277 -assertWithSideEffect:../../OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp:1026 -assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:292 -assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:391 -assertWithSideEffect:../../OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp:3058 -assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:286 -assertWithSideEffect:../../OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp:454 EOF -CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-2.7.0/ +CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-2.17.0/ mkdir -p ${CPPCHECK_BUILD_DIR} ${CPPCHECK} -j8 --enable=all --std=gnu++11 --library=boost \ @@ -87,9 +87,11 @@ -DORTHANC_SANDBOXED=0 \ -DORTHANC_SQLITE_VERSION=3027001 \ -DORTHANC_UNIT_TESTS_LINK_FRAMEWORK=0 \ + -DORTHANC_USE_SYSTEM_MINIZIP=0 \ -DPUGIXML_VERSION=150 \ -DUNIT_TESTS_WITH_HTTP_CONNEXIONS=1 \ -D__BYTE_ORDER=__LITTLE_ENDIAN \ + -D__CHAR_BIT__=8 \ -D__GNUC__=11 \ -D__GNUC_MINOR__=4 \ -D__GNUC_PATCHLEVEL_=0 \
--- a/OrthancServer/Resources/RunCppCheck-2.17.1.sh Mon Apr 13 08:46:24 2026 +0200 +++ b/OrthancServer/Resources/RunCppCheck-2.17.1.sh Mon Apr 13 10:04:36 2026 +0200 @@ -21,25 +21,26 @@ constParameterCallback:../../OrthancServer/Sources/OrthancGetRequestHandler.cpp:48 constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:447 constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:451 -constParameterPointer:../../OrthancFramework/Sources/Toolbox.cpp:3367 +constParameterPointer:../../OrthancFramework/Sources/Toolbox.cpp:3405 cstyleCast:../../OrthancServer/Plugins/Engine/PluginsManager.cpp:108 cstyleCast:../../OrthancServer/Plugins/Engine/PluginsManager.cpp:124 cstyleCast:../../OrthancServer/Plugins/Engine/PluginsManager.cpp:140 cstyleCast:../../OrthancServer/Plugins/Engine/PluginsManager.cpp:85 knownConditionTrueFalse:../../OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp:114 knownConditionTrueFalse:../../OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp:435 +knownConditionTrueFalse:../../OrthancFramework/Sources/Images/PamReader.cpp:204 +knownConditionTrueFalse:../../OrthancFramework/Sources/Images/PamReader.cpp:207 knownConditionTrueFalse:../../OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp:345 +knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2443 +knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2444 +knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2445 +knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2446 +knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2447 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2448 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2449 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2450 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2451 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2452 -knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2443 -knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2444 -knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2445 -knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2446 -knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2447 -knownConditionTrueFalse:../../OrthancFramework/Sources/Images/PamReader.cpp:204 nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:321 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:166 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:74 @@ -55,7 +56,7 @@ variableScope:../../OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp:94 EOF -CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-2.7.1/ +CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-2.17.1/ mkdir -p ${CPPCHECK_BUILD_DIR} ${CPPCHECK} -j8 --enable=all --quiet --std=c++11 \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OrthancServer/Resources/RunCppCheck-2.20.0.sh Mon Apr 13 10:04:36 2026 +0200 @@ -0,0 +1,98 @@ +#!/bin/bash +# Note: This script is tuned to run with cppcheck v2.17.1 + +set -ex + +CPPCHECK=cppcheck + +if [ $# -ge 1 ]; then + CPPCHECK=$1 +fi + +cat <<EOF > /tmp/cppcheck-suppressions.txt +EOF + +CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-2.20.0/ +mkdir -p ${CPPCHECK_BUILD_DIR} + +${CPPCHECK} -j8 --enable=all --quiet --std=c++11 \ + --cppcheck-build-dir=${CPPCHECK_BUILD_DIR} \ + --platform=unix64 \ + --language=c++ --suppress=missingIncludeSystem --library=boost \ + --suppress=unusedFunction --suppress=normalCheckLevelMaxBranches --suppress=useStlAlgorithm \ + --suppressions-list=/tmp/cppcheck-suppressions.txt \ + -D__BYTE_ORDER=__LITTLE_ENDIAN \ + -D__GNUC__ \ + -D__linux__ \ + \ + '-DORTHANC_FRAMEWORK_VERSION_IS_ABOVE(a,b,c)=true' \ + -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=1 \ + -DCIVETWEB_HAS_WEBDAV_WRITING=1 \ + -DDCMTK_VERSION_NUMBER=370 \ + -DHAS_ORTHANC_EXCEPTION=1 \ + -DHAVE_MALLOPT=1 \ + -DORTHANC_BUILDING_FRAMEWORK_LIBRARY=0 \ + -DORTHANC_BUILD_UNIT_TESTS=1 \ + -DORTHANC_ENABLE_BASE64=1 \ + -DORTHANC_ENABLE_CIVETWEB=1 \ + -DORTHANC_ENABLE_CURL=1 \ + -DORTHANC_ENABLE_DCMTK=1 \ + -DORTHANC_ENABLE_DCMTK_JPEG=1 \ + -DORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS=1 \ + -DORTHANC_ENABLE_DCMTK_NETWORKING=1 \ + -DORTHANC_ENABLE_DCMTK_TRANSCODING=1 \ + -DORTHANC_ENABLE_JPEG=1 \ + -DORTHANC_ENABLE_LOCALE=1 \ + -DORTHANC_ENABLE_LOGGING=1 \ + -DORTHANC_ENABLE_LOGGING_STDIO=1 \ + -DORTHANC_ENABLE_LUA=1 \ + -DORTHANC_ENABLE_MD5=1 \ + -DORTHANC_ENABLE_MONGOOSE=0 \ + -DORTHANC_ENABLE_PKCS11=1 \ + -DORTHANC_ENABLE_PLUGINS=1 \ + -DORTHANC_ENABLE_PNG=1 \ + -DORTHANC_ENABLE_PUGIXML=1 \ + -DORTHANC_ENABLE_SQLITE=1 \ + -DORTHANC_ENABLE_SSL=1 \ + -DORTHANC_ENABLE_ZLIB=1 \ + -DORTHANC_SANDBOXED=0 \ + -DORTHANC_SQLITE_VERSION=3027001 \ + -DORTHANC_UNIT_TESTS_LINK_FRAMEWORK=1 \ + -DORTHANC_USE_SYSTEM_MINIZIP=1 \ + -DORTHANC_VERSION="\"mainline\"" \ + -DPUGIXML_VERSION=150 \ + -DUNIT_TESTS_WITH_HTTP_CONNEXIONS=1 \ + \ + ../../OrthancFramework/Sources \ + ../../OrthancFramework/UnitTestsSources \ + ../../OrthancServer/Plugins/Engine \ + ../../OrthancServer/Plugins/Include \ + ../../OrthancServer/Sources \ + ../../OrthancServer/UnitTestsSources \ + ../../OrthancServer/Plugins/Samples/Common \ + \ + ../../OrthancServer/Plugins/Samples/AdoptDicomInstance/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/AutomatedJpeg2kCompression/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp \ + ../../OrthancServer/Plugins/Samples/ConnectivityChecks/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/CppSkeleton/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/CustomImageDecoder/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/DelayedDeletion/LargeDeleteJob.cpp \ + ../../OrthancServer/Plugins/Samples/DelayedDeletion/PendingDeletionsDatabase.cpp \ + ../../OrthancServer/Plugins/Samples/DelayedDeletion/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/Housekeeper/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/MultitenantDicom/DicomFilter.cpp \ + ../../OrthancServer/Plugins/Samples/MultitenantDicom/FindRequestHandler.cpp \ + ../../OrthancServer/Plugins/Samples/MultitenantDicom/MoveRequestHandler.cpp \ + ../../OrthancServer/Plugins/Samples/MultitenantDicom/MultitenantDicomServer.cpp \ + ../../OrthancServer/Plugins/Samples/MultitenantDicom/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/MultitenantDicom/PluginToolbox.cpp \ + ../../OrthancServer/Plugins/Samples/MultitenantDicom/StoreRequestHandler.cpp \ + ../../OrthancServer/Plugins/Samples/Sanitizer/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/StorageArea/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/StorageCommitmentScp/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/WebDavFilesystem/Plugin.cpp \ + ../../OrthancServer/Plugins/Samples/WebSkeleton/Framework/Plugin.cpp \ + \ + 2>&1
