changeset 6022:e79a985fdf37 attach-custom-data

cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 24 Feb 2025 09:33:04 +0100
parents 80acfe62ace3
children e0337e9ebf95
files OrthancFramework/Sources/FileStorage/FilesystemStorage.cpp OrthancFramework/Sources/FileStorage/IStorageArea.h OrthancServer/Plugins/Engine/OrthancPlugins.cpp OrthancServer/Resources/RunCppCheck.sh
diffstat 4 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/FileStorage/FilesystemStorage.cpp	Mon Feb 24 09:22:35 2025 +0100
+++ b/OrthancFramework/Sources/FileStorage/FilesystemStorage.cpp	Mon Feb 24 09:33:04 2025 +0100
@@ -279,7 +279,6 @@
   {
     namespace fs = boost::filesystem;
     typedef std::set<std::string> List;
-    std::string customDataNotUsed;
 
     List result;
     ListAllFiles(result);
--- a/OrthancFramework/Sources/FileStorage/IStorageArea.h	Mon Feb 24 09:22:35 2025 +0100
+++ b/OrthancFramework/Sources/FileStorage/IStorageArea.h	Mon Feb 24 09:33:04 2025 +0100
@@ -24,8 +24,9 @@
 
 #pragma once
 
+#include "../Compatibility.h"
+#include "../Enumerations.h"
 #include "../IMemoryBuffer.h"
-#include "../Enumerations.h"
 
 #include <stdint.h>
 #include <string>
@@ -86,7 +87,7 @@
                                const void* content,
                                size_t size,
                                FileContentType type,
-                               bool isCompressed)
+                               bool isCompressed) ORTHANC_OVERRIDE
     {
       Create(uuid, content, size, type);
     }
@@ -98,14 +99,14 @@
                                   const void* content,
                                   size_t size,
                                   FileContentType type,
-                                  bool isCompressed)
+                                  bool isCompressed) ORTHANC_OVERRIDE
     {
       Create(uuid, content, size, type);
     }
 
     virtual IMemoryBuffer* Read(const std::string& uuid,
                                 FileContentType type,
-                                const std::string& /*customData*/)
+                                const std::string& /*customData*/) ORTHANC_OVERRIDE
     {
       return Read(uuid, type);
     }
@@ -114,14 +115,14 @@
                                      FileContentType type,
                                      uint64_t start /* inclusive */,
                                      uint64_t end /* exclusive */,
-                                     const std::string& /*customData */)
+                                     const std::string& /*customData */) ORTHANC_OVERRIDE
     {
       return ReadRange(uuid, type, start, end);
     }
 
     virtual void Remove(const std::string& uuid,
                         FileContentType type,
-                        const std::string& customData)
+                        const std::string& customData) ORTHANC_OVERRIDE
     {
       Remove(uuid, type);
     }
--- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Mon Feb 24 09:22:35 2025 +0100
+++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Mon Feb 24 09:33:04 2025 +0100
@@ -5321,7 +5321,6 @@
         const _OrthancPluginStorageAreaCreate& p =
           *reinterpret_cast<const _OrthancPluginStorageAreaCreate*>(parameters);
         PluginStorageAreaBase& storage = *reinterpret_cast<PluginStorageAreaBase*>(p.storageArea);
-        std::string customDataNotUsed;
         storage.Create(p.uuid, p.content, static_cast<size_t>(p.size), Plugins::Convert(p.type));
         return true;
       }
--- a/OrthancServer/Resources/RunCppCheck.sh	Mon Feb 24 09:22:35 2025 +0100
+++ b/OrthancServer/Resources/RunCppCheck.sh	Mon Feb 24 09:33:04 2025 +0100
@@ -32,8 +32,8 @@
 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/Plugins/Engine/OrthancPluginDatabase.cpp:279
+assertWithSideEffect:../../OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp:1028
 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:292
 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:391
 assertWithSideEffect:../../OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp:3058