changeset 6887:ff10a9364ad7 streaming

cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 01 Jun 2026 18:26:19 +0200
parents ee907f0d911b
children f428f468ab02
files OrthancFramework/Sources/DataSource/DataSourceReader.cpp OrthancFramework/Sources/DataSource/DataSourceSequentialReader.h OrthancFramework/Sources/DataSource/DicomDataSource.h OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp OrthancFramework/Sources/DataSource/TranscoderDataSource.cpp OrthancFramework/UnitTestsSources/ToolboxTests.cpp OrthancServer/Resources/RunCppCheck-2.1.sh OrthancServer/Resources/RunCppCheck-2.17.1.sh OrthancServer/Resources/RunCppCheck-2.20.0.sh OrthancServer/Sources/OrthancGetRequestHandler.cpp OrthancServer/Sources/OrthancMoveRequestHandler.cpp OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp OrthancServer/Sources/ServerContext.cpp OrthancServer/Sources/ServerJobs/ArchiveJob.cpp OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp OrthancServer/Sources/ServerJobs/StoreJob.cpp OrthancServer/Sources/ServerTranscoder.h
diffstat 17 files changed, 36 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DataSource/DataSourceReader.cpp	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancFramework/Sources/DataSource/DataSourceReader.cpp	Mon Jun 01 18:26:19 2026 +0200
@@ -182,7 +182,7 @@
 
           value.reset(source_.Load(*id_));
 
-          if (!error && !value)
+          if (!value)
           {
             error.reset(new OrthancException(ErrorCode_NullPointer));
           }
--- a/OrthancFramework/Sources/DataSource/DataSourceSequentialReader.h	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancFramework/Sources/DataSource/DataSourceSequentialReader.h	Mon Jun 01 18:26:19 2026 +0200
@@ -63,7 +63,7 @@
       Item(IDynamicObject* value,
            size_t estimatedSize);
 
-      Item(const OrthancException& error);
+      explicit Item(const OrthancException& error);
 
       const IDynamicObject& GetValue() const;
 
--- a/OrthancFramework/Sources/DataSource/DicomDataSource.h	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancFramework/Sources/DataSource/DicomDataSource.h	Mon Jun 01 18:26:19 2026 +0200
@@ -70,7 +70,7 @@
       std::unique_ptr<DataSourceAnswer::Item>  item_;   // Holding item puts backpressure on the data source
 
     public:
-      Dicom(DataSourceAnswer::Item* item /* takes ownership */);
+      explicit Dicom(DataSourceAnswer::Item* item /* takes ownership */);
 
       ParsedDicomFile* Clone();
 
--- a/OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp	Mon Jun 01 18:26:19 2026 +0200
@@ -142,7 +142,7 @@
     SourceType  sourceType_;
 
   public:
-    Disconnector(SourceType sourceType) :
+    explicit Disconnector(SourceType sourceType) :
       sourceType_(sourceType)
     {
     }
--- a/OrthancFramework/Sources/DataSource/TranscoderDataSource.cpp	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancFramework/Sources/DataSource/TranscoderDataSource.cpp	Mon Jun 01 18:26:19 2026 +0200
@@ -61,7 +61,7 @@
     size_t                            size_;
 
   public:
-    Value(IDicomTranscoder::DicomImage* transcoded)
+    explicit Value(IDicomTranscoder::DicomImage* transcoded)
     {
       std::unique_ptr<IDicomTranscoder::DicomImage> protection(transcoded);
 
--- a/OrthancFramework/UnitTestsSources/ToolboxTests.cpp	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancFramework/UnitTestsSources/ToolboxTests.cpp	Mon Jun 01 18:26:19 2026 +0200
@@ -491,11 +491,4 @@
   ASSERT_EQ(MEGABYTE * static_cast<int16_t>(16 * 1024), 16ull * 1024ull * 1024ull * 1024ull);
   ASSERT_EQ(static_cast<int32_t>(16 * 1024 * 1024) * KILOBYTE, 16ull * 1024ull * 1024ull * 1024ull);
   ASSERT_EQ(KILOBYTE * static_cast<int32_t>(16 * 1024 * 1024), 16ull * 1024ull * 1024ull * 1024ull);
-
-  ASSERT_EQ(8, sizeof(static_cast<int16_t>(16) * GIGABYTE));
-  ASSERT_EQ(8, sizeof(GIGABYTE * static_cast<int16_t>(16)));
-  ASSERT_EQ(8, sizeof(static_cast<int16_t>(16 * 1024) * MEGABYTE));
-  ASSERT_EQ(8, sizeof(MEGABYTE * static_cast<int16_t>(16 * 1024)));
-  ASSERT_EQ(8, sizeof(static_cast<int32_t>(16 * 1024 * 1024) * KILOBYTE));
-  ASSERT_EQ(8, sizeof(KILOBYTE * static_cast<int32_t>(16 * 1024 * 1024)));
 }
--- a/OrthancServer/Resources/RunCppCheck-2.1.sh	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancServer/Resources/RunCppCheck-2.1.sh	Mon Jun 01 18:26:19 2026 +0200
@@ -15,8 +15,8 @@
 assertWithSideEffect:../../OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp:279
 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:292
 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:391
-assertWithSideEffect:../../OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp:3078
-assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:287
+assertWithSideEffect:../../OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp:3110
+assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:293
 constParameter:../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp
 knownArgument:../../OrthancFramework/UnitTestsSources/ImageTests.cpp
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp
@@ -26,18 +26,18 @@
 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:74
 stlFindInsert:../../OrthancServer/Sources/Database/MainDicomTagsRegistry.cpp:65
 stlFindInsert:../../OrthancServer/Sources/Database/ResourcesContent.h:141
-stlFindInsert:../../OrthancServer/Sources/OrthancWebDav.cpp:329
+stlFindInsert:../../OrthancServer/Sources/OrthancWebDav.cpp:333
 stlFindInsert:../../OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp:42
-stlFindInsert:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:362
+stlFindInsert:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:368
 stlFindInsert:../../OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp:192
 syntaxError:../../OrthancFramework/Sources/SQLite/FunctionContext.h:53
 syntaxError:../../OrthancFramework/UnitTestsSources/DicomMapTests.cpp:74
 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:92
+unreadVariable:../../OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp:1174
+useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:100
 useInitializationList:../../OrthancFramework/Sources/Images/PngWriter.cpp:99
-useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:275
+useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:277
 EOF
 
 CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-2.1/
--- a/OrthancServer/Resources/RunCppCheck-2.17.1.sh	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancServer/Resources/RunCppCheck-2.17.1.sh	Mon Jun 01 18:26:19 2026 +0200
@@ -12,24 +12,20 @@
 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
+assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:293
 constParameterCallback:../../OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.cpp:50
 constParameterCallback:../../OrthancFramework/Sources/DicomNetworking/Internals/StoreScp.cpp:112
 constParameterCallback:../../OrthancFramework/Sources/DicomNetworking/Internals/StoreScp.cpp:113
 constParameterCallback:../../OrthancFramework/Sources/Pkcs11.cpp:125
 constParameterCallback:../../OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp:3553
-constParameterCallback:../../OrthancServer/Sources/OrthancGetRequestHandler.cpp:48
+constParameterCallback:../../OrthancServer/Sources/OrthancGetRequestHandler.cpp:66
 constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:450
 constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:454
 constParameterPointer:../../OrthancFramework/Sources/Toolbox.cpp:3351
 knownConditionTrueFalse:../../OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp:112
-knownConditionTrueFalse:../../OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp:440
-knownConditionTrueFalse:../../OrthancFramework/Sources/Images/PamReader.cpp:204
-knownConditionTrueFalse:../../OrthancFramework/Sources/Images/PamReader.cpp:207
+knownConditionTrueFalse:../../OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp:441
+knownConditionTrueFalse:../../OrthancFramework/Sources/Images/PamReader.cpp:208
 knownConditionTrueFalse:../../OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp:345
-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
@@ -37,6 +33,9 @@
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2451
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2452
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2453
+knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2454
+knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2455
+knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp:2456
 nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:321
 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:166
 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:74
@@ -45,11 +44,11 @@
 syntaxError:../../OrthancFramework/UnitTestsSources/DicomMapTests.cpp:74
 syntaxError:../../OrthancFramework/UnitTestsSources/ZipTests.cpp:133
 syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:325
-useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:99
+useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:100
 useInitializationList:../../OrthancFramework/Sources/Images/PngWriter.cpp:99
-useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:280
+useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:277
 variableScope:../../OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp:230
-variableScope:../../OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp:97
+variableScope:../../OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp:98
 EOF
 
 CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-2.17.1/
--- a/OrthancServer/Resources/RunCppCheck-2.20.0.sh	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancServer/Resources/RunCppCheck-2.20.0.sh	Mon Jun 01 18:26:19 2026 +0200
@@ -10,10 +10,10 @@
 fi
 
 cat <<EOF > /tmp/cppcheck-suppressions.txt
-assertWithSideEffect:../../OrthancFramework/Sources/DataSource/DataSourceReader.cpp:220
+assertWithSideEffect:../../OrthancFramework/Sources/DataSource/DataSourceReader.cpp:310
 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:292
 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:391
-assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:287
+assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:293
 constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:450
 constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:454
 constParameterPointer:../../OrthancFramework/Sources/Toolbox.cpp:3351
@@ -25,11 +25,11 @@
 syntaxError:../../OrthancFramework/Sources/SQLite/FunctionContext.h
 syntaxError:../../OrthancFramework/UnitTestsSources/DicomMapTests.cpp:74
 syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:325
-useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:99
+useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:100
 useInitializationList:../../OrthancFramework/Sources/Images/PngWriter.cpp:99
-useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:280
+useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:277
 variableScope:../../OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp:230
-variableScope:../../OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp:97
+variableScope:../../OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp:98
 EOF
 
 CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-2.20.0/
--- a/OrthancServer/Sources/OrthancGetRequestHandler.cpp	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancServer/Sources/OrthancGetRequestHandler.cpp	Mon Jun 01 18:26:19 2026 +0200
@@ -50,7 +50,7 @@
     std::string instanceId_;
 
   public:
-    ReaderUserData(const std::string& instanceId) :
+    explicit ReaderUserData(const std::string& instanceId) :
       instanceId_(instanceId)
     {
     }
--- a/OrthancServer/Sources/OrthancMoveRequestHandler.cpp	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancServer/Sources/OrthancMoveRequestHandler.cpp	Mon Jun 01 18:26:19 2026 +0200
@@ -48,7 +48,7 @@
       std::string instanceId_;
 
     public:
-      MoveReaderUserData(const std::string& instanceId) :
+      explicit MoveReaderUserData(const std::string& instanceId) :
         instanceId_(instanceId)
       {
       }
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp	Mon Jun 01 18:26:19 2026 +0200
@@ -3806,12 +3806,12 @@
     ServerContext& context = OrthancRestApi::GetContext(call);
 
     const std::string id = call.GetUriComponent("id", "");
-    std::string pdf;
 
     {
       std::unique_ptr<DicomDataSource::Dicom> dicom(context.ReadParsedDicom(id));
       DicomDataSource::Dicom::Lock lock(*dicom);
 
+      std::string pdf;
       if (lock.GetContent().ExtractPdf(pdf))
       {
         call.GetOutput().AnswerBuffer(pdf, MimeType_Pdf);
--- a/OrthancServer/Sources/ServerContext.cpp	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancServer/Sources/ServerContext.cpp	Mon Jun 01 18:26:19 2026 +0200
@@ -1218,7 +1218,7 @@
     BufferHttpSender sender;
     sender.SetBuffer(range->GetData(), range->GetSize());
     sender.SetContentType(GetFileContentMime(attachment.GetContentType()));
-    sender.SetContentFilename(filename.c_str());
+    sender.SetContentFilename(filename);
 
     HttpStreamTranscoder transcoder(sender, CompressionType_None);
     output.AnswerStream(transcoder);
--- a/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Mon Jun 01 18:26:19 2026 +0200
@@ -495,7 +495,7 @@
       std::string   filename_;
 
     public:
-      OpenDirectoryCommand(const std::string& filename) :
+      explicit OpenDirectoryCommand(const std::string& filename) :
         filename_(filename)
       {
       }
--- a/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp	Mon Jun 01 18:26:19 2026 +0200
@@ -188,9 +188,9 @@
       for (std::set<std::string>::const_iterator it = instancesToReconstruct_.begin(); it != instancesToReconstruct_.end(); ++it)
       {
         std::unique_ptr<DicomDataSource::Dicom> dicom(GetContext().ReadParsedDicom(*it));
-        DicomDataSource::Dicom::Lock lock(*dicom);
+        DicomDataSource::Dicom::Lock dicomLock(*dicom);
 
-        const ParsedDicomFile& modifiedDicom = lock.GetContent();
+        const ParsedDicomFile& modifiedDicom = dicomLock.GetContent();
 
         GetContext().GetIndex().ReconstructInstance(modifiedDicom, false, ResourceType_Instance /* dummy */);
       }
--- a/OrthancServer/Sources/ServerJobs/StoreJob.cpp	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancServer/Sources/ServerJobs/StoreJob.cpp	Mon Jun 01 18:26:19 2026 +0200
@@ -41,7 +41,7 @@
     std::string instanceId_;
 
   public:
-    ReaderUserData(const std::string& instanceId) :
+    explicit ReaderUserData(const std::string& instanceId) :
       instanceId_(instanceId)
     {
     }
--- a/OrthancServer/Sources/ServerTranscoder.h	Mon Jun 01 18:02:56 2026 +0200
+++ b/OrthancServer/Sources/ServerTranscoder.h	Mon Jun 01 18:26:19 2026 +0200
@@ -77,7 +77,7 @@
                                                      unsigned int frameIndex);
 
   public:
-    ServerTranscoder(unsigned int maxConcurrentDcmtkTranscoder);
+    explicit ServerTranscoder(unsigned int maxConcurrentDcmtkTranscoder);
 
 #if ORTHANC_ENABLE_PLUGINS == 1
     void SetPlugins(OrthancPlugins& plugins);