changeset 6687:3412a4b8fb04

cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 13 Apr 2026 11:04:29 +0200
parents b20a48627847
children 1f3e0febc18e
files OrthancFramework/Sources/Cache/MemoryCache.cpp OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp OrthancFramework/Sources/DicomParsing/DicomDirWriter.cpp OrthancFramework/Sources/Images/PngReader.cpp OrthancFramework/Sources/Logging.cpp OrthancFramework/Sources/MetricsRegistry.cpp OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp OrthancServer/Plugins/Engine/OrthancPlugins.cpp OrthancServer/Plugins/Engine/OrthancPlugins.h OrthancServer/Plugins/Engine/PluginsManager.cpp OrthancServer/Resources/RunCppCheck-2.20.0.sh OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp OrthancServer/Sources/ServerJobs/ArchiveJob.cpp OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp OrthancServer/Sources/StorageCommitmentReports.cpp
diffstat 15 files changed, 96 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/Cache/MemoryCache.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancFramework/Sources/Cache/MemoryCache.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -87,10 +87,9 @@
     {
       while (!index_.IsEmpty())
       {
-        Page* element = NULL;
-
         try
         {
+          Page* element = NULL;
           index_.RemoveOldest(element);
 
           assert(element != NULL);
--- a/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -141,7 +141,6 @@
   T_ASC_SC_ROLE acceptedRole)
 {
   int n, i, k;
-  const DUL_PRESENTATIONCONTEXT *dpc;
   T_ASC_PresentationContext pc;
 
   n = ASC_countPresentationContexts(params);
@@ -176,8 +175,8 @@
       T_ASC_P_ResultReason reason;
 
       /* do not refuse if already accepted */
-      dpc = findPresentationContextID(params->DULparams.acceptedPresentationContext,
-                                      pc.presentationContextID);
+      const DUL_PRESENTATIONCONTEXT *dpc = findPresentationContextID(params->DULparams.acceptedPresentationContext,
+                                                                     pc.presentationContextID);
       if (dpc == NULL || dpc->result != ASC_P_ACCEPTANCE)
       {
 
--- a/OrthancFramework/Sources/DicomParsing/DicomDirWriter.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancFramework/Sources/DicomParsing/DicomDirWriter.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -295,10 +295,10 @@
       return extendedSopClass_;
     }
 
-    void FillPatient(DcmDirectoryRecord& record,
-                     DcmDataset& dicom,
-                     Encoding encoding,
-                     bool hasCodeExtensions)
+    static void FillPatient(DcmDirectoryRecord& record,
+                            DcmDataset& dicom,
+                            Encoding encoding,
+                            bool hasCodeExtensions)
     {
       // cf. "DicomDirInterface::buildPatientRecord()"
 
@@ -366,12 +366,12 @@
       }
     }
 
-    void FillInstance(DcmDirectoryRecord& record,
-                      DcmDataset& dicom,
-                      Encoding encoding,
-                      bool hasCodeExtensions,
-                      DcmMetaInfo& metaInfo,
-                      const char* path)
+    static void FillInstance(DcmDirectoryRecord& record,
+                             DcmDataset& dicom,
+                             Encoding encoding,
+                             bool hasCodeExtensions,
+                             DcmMetaInfo& metaInfo,
+                             const char* path)
     {
       // cf. "DicomDirInterface::buildImageRecord()"
 
--- a/OrthancFramework/Sources/Images/PngReader.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancFramework/Sources/Images/PngReader.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -32,6 +32,7 @@
 #  include "../SystemToolbox.h"
 #endif
 
+#include <boost/noncopyable.hpp>
 #include <png.h>
 #include <string.h>  // For memcpy()
 
@@ -40,7 +41,7 @@
 #if ORTHANC_SANDBOXED == 0
   namespace 
   {
-    struct FileRabi
+    struct FileRabi : public boost::noncopyable
     {
       FILE* fp_;
 
@@ -65,7 +66,7 @@
 #endif
 
 
-  struct PngReader::PngRabi
+  struct PngReader::PngRabi : public boost::noncopyable
   {
     png_structp png_;
     png_infop info_;
@@ -244,7 +245,7 @@
 
   namespace
   {
-    struct MemoryBuffer
+    struct MemoryBuffer : public boost::noncopyable
     {
       const uint8_t* buffer_;
       size_t size_;
--- a/OrthancFramework/Sources/Logging.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancFramework/Sources/Logging.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -444,11 +444,11 @@
       }
     }
 
-    void InitializePluginContext(void* pluginContext)
+    void InitializePluginContext(const void* pluginContext)
     {
     }
 
-    void InitializePluginContext(void* pluginContext, const char* pluginName)
+    void InitializePluginContext(const void* pluginContext, const char* pluginName)
     {
     }
 
--- a/OrthancFramework/Sources/MetricsRegistry.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancFramework/Sources/MetricsRegistry.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -98,7 +98,7 @@
       {
       }
 
-      int GetPeriodDuration(const MetricsUpdatePolicy& policy)
+      static int GetPeriodDuration(const MetricsUpdatePolicy& policy)
       {
         switch (policy)
         {
--- a/OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -1563,7 +1563,17 @@
       size = extensionsSize;  // Not all the extensions are available
     }
 
-    memcpy(&extensions_, extensions, size);
+    if (extensions == NULL)
+    {
+      if (size > 0)
+      {
+        throw OrthancException(ErrorCode_Plugin);
+      }
+    }
+    else
+    {
+      memcpy(&extensions_, extensions, size);
+    }
 
     bool isOptimal = true;
 
--- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -653,8 +653,8 @@
         remove_(remove),
         errorDictionary_(errorDictionary)
       {
-        if (create_ == NULL ||
-            remove_ == NULL)
+        if (create == NULL ||
+            remove == NULL)
         {
           throw OrthancException(ErrorCode_Plugin, "Storage area plugin doesn't implement all the required primitives");
         }
@@ -703,7 +703,7 @@
         read_(callbacks.read),
         free_(callbacks.free)
       {
-        if (read_ == NULL)
+        if (callbacks.read == NULL)
         {
           throw OrthancException(ErrorCode_Plugin, "Storage area plugin doesn't implement the \"Read\" primitive");
         }
@@ -757,7 +757,7 @@
         readWhole_(callbacks.readWhole),
         readRange_(callbacks.readRange)
       {
-        if (readWhole_ == NULL)
+        if (callbacks.readWhole == NULL)
         {
           throw OrthancException(ErrorCode_Plugin, "Storage area plugin doesn't implement the \"ReadWhole\" primitive");
         }
@@ -848,9 +848,9 @@
         remove_(callbacks.remove),
         errorDictionary_(errorDictionary)
       {
-        if (create_ == NULL ||
-            readRange_ == NULL ||
-            remove_ == NULL)
+        if (callbacks.create == NULL ||
+            callbacks.readRange == NULL ||
+            callbacks.remove == NULL)
         {
           throw OrthancException(ErrorCode_Plugin, "Storage area plugin does not implement all the required primitives (create, remove, and readRange)");
         }
--- a/OrthancServer/Plugins/Engine/OrthancPlugins.h	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancServer/Plugins/Engine/OrthancPlugins.h	Mon Apr 13 11:04:29 2026 +0200
@@ -152,13 +152,13 @@
 
     void RegisterAuditLogHandler(const void* parameters);
 
-    void AnswerBuffer(const void* parameters);
+    static void AnswerBuffer(const void* parameters);
 
-    void Redirect(const void* parameters);
+    static void Redirect(const void* parameters);
 
-    void CompressAndAnswerPngImage(const void* parameters);
+    static void CompressAndAnswerPngImage(const void* parameters);
 
-    void CompressAndAnswerImage(const void* parameters);
+    static void CompressAndAnswerImage(const void* parameters);
 
     void GetDicomForInstance(const void* parameters);
 
@@ -186,58 +186,58 @@
     void AccessDicomConnection(_OrthancPluginService service,
                                const void* parameters);
 
-    void SendHttpStatusCode(const void* parameters);
+    static void SendHttpStatusCode(const void* parameters);
 
-    void SendHttpStatus(const void* parameters);
+    static void SendHttpStatus(const void* parameters);
 
-    void SendUnauthorized(const void* parameters);
+    static void SendUnauthorized(const void* parameters);
 
-    void SendMethodNotAllowed(const void* parameters);
+    static void SendMethodNotAllowed(const void* parameters);
 
-    void SetCookie(const void* parameters);
+    static void SetCookie(const void* parameters);
 
-    void SetHttpHeader(const void* parameters);
+    static void SetHttpHeader(const void* parameters);
 
-    void SetHttpErrorDetails(const void* parameters);
+    static void SetHttpErrorDetails(const void* parameters);
 
-    void BufferCompression(const void* parameters);
+    static void BufferCompression(const void* parameters);
 
     void UncompressImage(const void* parameters);
 
-    void CompressImage(const void* parameters);
+    static void CompressImage(const void* parameters);
 
-    void ConvertPixelFormat(const void* parameters);
+    static void ConvertPixelFormat(const void* parameters);
 
-    void CallHttpClient(const void* parameters);
+    static void CallHttpClient(const void* parameters);
 
-    void CallHttpClient2(const void* parameters);
+    static void CallHttpClient2(const void* parameters);
 
     void ChunkedHttpClient(const void* parameters);
 
     void CallRestApi(const void* parameters);
 
-    void CallPeerApi(const void* parameters);
+    static void CallPeerApi(const void* parameters);
   
-    void GetFontInfo(const void* parameters);
+    static void GetFontInfo(const void* parameters);
 
-    void DrawText(const void* parameters);
+    static void DrawText(const void* parameters);
 
     void DatabaseAnswer(const void* parameters);
 
     void ApplyDicomToJson(_OrthancPluginService service,
                           const void* parameters);
 
-    void ApplyCreateDicom(const _OrthancPluginCreateDicom& parameters,
-                          const char* privateCreatorC);
+    static void ApplyCreateDicom(const _OrthancPluginCreateDicom& parameters,
+                                 const char* privateCreatorC);
 
     void ApplyCreateImage(_OrthancPluginService service,
                           const void* parameters);
 
-    void ApplyLookupDictionary(const void* parameters);
+    static void ApplyLookupDictionary(const void* parameters);
 
-    void ApplySendMultipartItem(const void* parameters);
+    static void ApplySendMultipartItem(const void* parameters);
 
-    void ApplySendMultipartItem2(const void* parameters);
+    static void ApplySendMultipartItem2(const void* parameters);
 
     void ApplyLoadDicomInstance(const _OrthancPluginLoadDicomInstance& parameters);
 
@@ -269,10 +269,10 @@
 
     void ApplyEmitAuditLog(const _OrthancPluginEmitAuditLog& parameters);
 
-    void ComputeHash(_OrthancPluginService service,
-                     const void* parameters);
+    static void ComputeHash(_OrthancPluginService service,
+                            const void* parameters);
 
-    void GetTagName(const void* parameters);
+    static void GetTagName(const void* parameters);
 
     void SignalChangeInternal(OrthancPluginChangeType changeType,
                               OrthancPluginResourceType resourceType,
--- a/OrthancServer/Plugins/Engine/PluginsManager.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancServer/Plugins/Engine/PluginsManager.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -82,7 +82,7 @@
      **/
 
     Initialize initialize;
-    *(void **) (&initialize) = plugin.GetFunction("OrthancPluginInitialize");
+    *reinterpret_cast<void**>(&initialize) = plugin.GetFunction("OrthancPluginInitialize");
 #endif
 
     assert(initialize != NULL);
@@ -105,7 +105,7 @@
     Finalize finalize = (Finalize) plugin.GetFunction("OrthancPluginFinalize");
 #else
     Finalize finalize;
-    *(void **) (&finalize) = plugin.GetFunction("OrthancPluginFinalize");
+    *reinterpret_cast<void**>(&finalize) = plugin.GetFunction("OrthancPluginFinalize");
 #endif
 
     assert(finalize != NULL);
@@ -121,7 +121,7 @@
     GetName getName = (GetName) plugin.GetFunction("OrthancPluginGetName");
 #else
     GetName getName;
-    *(void **) (&getName) = plugin.GetFunction("OrthancPluginGetName");
+    *reinterpret_cast<void**>(&getName) = plugin.GetFunction("OrthancPluginGetName");
 #endif
 
     assert(getName != NULL);
@@ -137,7 +137,7 @@
     GetVersion getVersion = (GetVersion) plugin.GetFunction("OrthancPluginGetVersion");
 #else
     GetVersion getVersion;
-    *(void **) (&getVersion) = plugin.GetFunction("OrthancPluginGetVersion");
+    *reinterpret_cast<void**>(&getVersion) = plugin.GetFunction("OrthancPluginGetVersion");
 #endif
 
     assert(getVersion != NULL);
--- a/OrthancServer/Resources/RunCppCheck-2.20.0.sh	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancServer/Resources/RunCppCheck-2.20.0.sh	Mon Apr 13 11:04:29 2026 +0200
@@ -10,6 +10,23 @@
 fi
 
 cat <<EOF > /tmp/cppcheck-suppressions.txt
+assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:292
+assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:391
+assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:287
+constParameterPointer:../../OrthancFramework/Sources/Toolbox.cpp:3405
+missingInclude:../../OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.cpp:41
+nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:321
+stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:166
+stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:74
+stlFindInsert:../../OrthancServer/Sources/Database/ResourcesContent.h:141
+syntaxError:../../OrthancFramework/Sources/SQLite/FunctionContext.h
+syntaxError:../../OrthancFramework/UnitTestsSources/DicomMapTests.cpp:74
+syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:325
+useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:92
+useInitializationList:../../OrthancFramework/Sources/Images/PngWriter.cpp:99
+useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:275
+variableScope:../../OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp:229
+variableScope:../../OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp:94
 EOF
 
 CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-2.20.0/
@@ -19,7 +36,8 @@
             --cppcheck-build-dir=${CPPCHECK_BUILD_DIR} \
             --platform=unix64 \
             --language=c++ --suppress=missingIncludeSystem --library=boost \
-            --suppress=unusedFunction --suppress=normalCheckLevelMaxBranches --suppress=useStlAlgorithm \
+            --suppress=unusedFunction --suppress=normalCheckLevelMaxBranches \
+            --suppress=useStlAlgorithm --suppress=constParameterCallback --suppress=knownConditionTrueFalse \
             --suppressions-list=/tmp/cppcheck-suppressions.txt \
             -D__BYTE_ORDER=__LITTLE_ENDIAN \
             -D__GNUC__ \
@@ -31,6 +49,8 @@
             -DDCMTK_VERSION_NUMBER=370 \
             -DHAS_ORTHANC_EXCEPTION=1 \
             -DHAVE_MALLOPT=1 \
+            -DJSONCPP_VERSION_MAJOR=1 \
+            -DJSONCPP_VERSION_MINOR=0 \
             -DORTHANC_BUILDING_FRAMEWORK_LIBRARY=0 \
             -DORTHANC_BUILD_UNIT_TESTS=1 \
             -DORTHANC_ENABLE_BASE64=1 \
--- a/OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -3732,7 +3732,9 @@
     db_(db),
     state_(State_Waiting),
     storeId_(storeId),
-    limit_(100)
+    limit_(100),
+    currentKey_(keys_.end()),
+    currentValue_(keys_.end())
   {
     if (storeId.empty())
     {
--- a/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -771,7 +771,7 @@
         path = std::string("Unknown ") + EnumerationToString(GetResourceLevel(level));
       }
 
-      commands_.AddOpenDirectory(path.c_str());
+      commands_.AddOpenDirectory(path);
     }
 
     virtual void Close() ORTHANC_OVERRIDE
--- a/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -685,8 +685,6 @@
   {
     boost::recursive_mutex::scoped_lock lock(mutex_);  // because we access the parentResources_
 
-    std::set<DicomTag> emptyRequestedTags;
-
     if (modification_.get() == NULL)
     {
       throw OrthancException(ErrorCode_BadSequenceOfCalls);
--- a/OrthancServer/Sources/StorageCommitmentReports.cpp	Mon Apr 13 10:04:36 2026 +0200
+++ b/OrthancServer/Sources/StorageCommitmentReports.cpp	Mon Apr 13 11:04:29 2026 +0200
@@ -184,11 +184,11 @@
   {
     while (!content_.IsEmpty())
     {
-      Report* report = NULL;
-
       try
       {
+        Report* report = NULL;
         content_.RemoveOldest(report);
+
         assert(report != NULL);
         delete report;
       }