Mercurial > hg > orthanc

changeset 7118:50503cd4e588

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 14 Aug 2026 12:03:59 +0200
parents fc06d1b317c3
children 9bc237efa31a
files OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp OrthancFramework/Sources/MultiThreading/Internals/ThreadPoolFuture.h OrthancFramework/Sources/MultiThreading/SequentialExecutorService.cpp OrthancServer/Resources/RunCppCheck-2.1.sh OrthancServer/Resources/RunCppCheck-2.17.0.sh OrthancServer/Resources/RunCppCheck-2.17.1.sh
diffstat 7 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake	Fri Aug 14 11:42:20 2026 +0200
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake	Fri Aug 14 12:03:59 2026 +0200
@@ -164,6 +164,8 @@
   ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Cache/MemoryObjectCache.cpp
   ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Cache/SharedObjectCache.cpp
   ${CMAKE_CURRENT_LIST_DIR}/../../Sources/ChunkedBuffer.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/BaseDataIdentifier.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/DataSourceRequest.cpp
   ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomFormat/DicomPath.cpp
   ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomFormat/DicomTag.cpp
   ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DicomFormat/Window.cpp
@@ -639,11 +641,9 @@
   list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
     ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Cache/MemoryStringCache.cpp
     ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Cache/SharedArchive.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/BaseDataIdentifier.cpp
     ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/DataSourceAnswer.cpp
     ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/DataSourceMemoryBudget.cpp
     ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/DataSourceReader.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/DataSourceRequest.cpp
     ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/DataSourceSequentialReader.cpp
     ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/StorageAreaDataSource.cpp
     ${CMAKE_CURRENT_LIST_DIR}/../../Sources/MultiThreading/BlockingSharedMessageQueue.cpp
--- a/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp	Fri Aug 14 11:42:20 2026 +0200
+++ b/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp	Fri Aug 14 12:03:59 2026 +0200
@@ -333,7 +333,7 @@
       LOG(INFO) << "Executing the trailing timeout in the sequence of operations";
       operationAdded_.timed_wait(lock, trailingTimeout_);
             
-      if (current_ == operations_.size())
+      if (current_ == operations_.size())  // Could have changed during the "timed_wait()"
       {
         // No operation was added during the trailing timeout: The
         // job is over
--- a/OrthancFramework/Sources/MultiThreading/Internals/ThreadPoolFuture.h	Fri Aug 14 11:42:20 2026 +0200
+++ b/OrthancFramework/Sources/MultiThreading/Internals/ThreadPoolFuture.h	Fri Aug 14 12:03:59 2026 +0200
@@ -41,7 +41,7 @@
     public:
       explicit ThreadPoolFuture(boost::shared_ptr<FutureState>& state);
 
-      virtual ~ThreadPoolFuture();
+      virtual ~ThreadPoolFuture() ORTHANC_OVERRIDE;
 
       IDynamicObject* ReleaseResult() ORTHANC_OVERRIDE;
     };
--- a/OrthancFramework/Sources/MultiThreading/SequentialExecutorService.cpp	Fri Aug 14 11:42:20 2026 +0200
+++ b/OrthancFramework/Sources/MultiThreading/SequentialExecutorService.cpp	Fri Aug 14 12:03:59 2026 +0200
@@ -36,7 +36,7 @@
     std::unique_ptr<IDynamicObject>  value_;
 
   public:
-    Future(IDynamicObject* value) :
+    explicit Future(IDynamicObject* value) :
       value_(value)
     {
       if (value_ == NULL)
--- a/OrthancServer/Resources/RunCppCheck-2.1.sh	Fri Aug 14 11:42:20 2026 +0200
+++ b/OrthancServer/Resources/RunCppCheck-2.1.sh	Fri Aug 14 12:03:59 2026 +0200
@@ -21,7 +21,7 @@
 knownArgument:../../OrthancFramework/UnitTestsSources/ImageTests.cpp
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp
 nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:321
-stlFindInsert:../../OrthancFramework/Sources/DicomFormat/DicomMap.cpp:1545
+stlFindInsert:../../OrthancFramework/Sources/DicomFormat/DicomMap.cpp:1514
 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:166
 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:74
 stlFindInsert:../../OrthancServer/Sources/Database/MainDicomTagsRegistry.cpp:65
--- a/OrthancServer/Resources/RunCppCheck-2.17.0.sh	Fri Aug 14 11:42:20 2026 +0200
+++ b/OrthancServer/Resources/RunCppCheck-2.17.0.sh	Fri Aug 14 12:03:59 2026 +0200
@@ -10,6 +10,7 @@
 fi
 
 cat <<EOF > /tmp/cppcheck-suppressions.txt
+assertWithSideEffect:../../OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp:460
 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:292
 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:391
 assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:293
@@ -25,7 +26,7 @@
 knownConditionTrueFalse:../../OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp:112
 knownConditionTrueFalse:../../OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp:444
 knownConditionTrueFalse:../../OrthancFramework/Sources/Images/PamReader.cpp:204
-knownConditionTrueFalse:../../OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp:345
+knownConditionTrueFalse:../../OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp:336
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2451
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2452
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2453
--- a/OrthancServer/Resources/RunCppCheck-2.17.1.sh	Fri Aug 14 11:42:20 2026 +0200
+++ b/OrthancServer/Resources/RunCppCheck-2.17.1.sh	Fri Aug 14 12:03:59 2026 +0200
@@ -25,7 +25,7 @@
 knownConditionTrueFalse:../../OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp:112
 knownConditionTrueFalse:../../OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp:444
 knownConditionTrueFalse:../../OrthancFramework/Sources/Images/PamReader.cpp:204
-knownConditionTrueFalse:../../OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp:345
+knownConditionTrueFalse:../../OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp:336
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2451
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2452
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2453