changeset 6245:93d2e634fc6d

cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 11 Jul 2025 17:33:28 +0200
parents f1fe166b21d5
children d70e4de0c847
files OrthancFramework/Sources/HttpServer/HttpServer.cpp OrthancFramework/Sources/HttpServer/HttpServer.h OrthancServer/Resources/RunCppCheck-2.17.0.sh OrthancServer/Resources/RunCppCheck.sh
diffstat 4 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/HttpServer/HttpServer.cpp	Fri Jul 11 17:27:37 2025 +0200
+++ b/OrthancFramework/Sources/HttpServer/HttpServer.cpp	Fri Jul 11 17:33:28 2025 +0200
@@ -1421,7 +1421,7 @@
     if (method == HttpMethod_Post ||
         method == HttpMethod_Put)
     {
-      PostDataStatus status;
+      PostDataStatus postStatus;
 
       bool isMultipartForm = false;
 
@@ -1438,8 +1438,8 @@
          **/
         isMultipartForm = true;
 
-        status = ReadBodyToString(body, connection, headers);
-        if (status == PostDataStatus_Success)
+        postStatus = ReadBodyToString(body, connection, headers);
+        if (postStatus == PostDataStatus_Success)
         {
           server.ProcessMultipartFormData(remoteIp, username, uri, headers, body, boundary, authenticationPayload);
           output.SendStatus(HttpStatus_200_Ok);
@@ -1464,20 +1464,20 @@
             throw OrthancException(ErrorCode_InternalError);
           }
 
-          status = ReadBodyToStream(*stream, connection, headers);
+          postStatus = ReadBodyToStream(*stream, connection, headers);
 
-          if (status == PostDataStatus_Success)
+          if (postStatus == PostDataStatus_Success)
           {
             stream->Execute(output);
           }
         }
         else
         {
-          status = ReadBodyToString(body, connection, headers);
+          postStatus = ReadBodyToString(body, connection, headers);
         }
       }
 
-      switch (status)
+      switch (postStatus)
       {
         case PostDataStatus_NoLength:
           output.SendStatus(HttpStatus_411_LengthRequired);
--- a/OrthancFramework/Sources/HttpServer/HttpServer.h	Fri Jul 11 17:27:37 2025 +0200
+++ b/OrthancFramework/Sources/HttpServer/HttpServer.h	Fri Jul 11 17:33:28 2025 +0200
@@ -124,7 +124,7 @@
     bool IsRunning() const;
 
   public:
-    HttpServer(MetricsRegistry& metricsRegistry);
+    explicit HttpServer(MetricsRegistry& metricsRegistry);
 
     ~HttpServer();
 
--- a/OrthancServer/Resources/RunCppCheck-2.17.0.sh	Fri Jul 11 17:27:37 2025 +0200
+++ b/OrthancServer/Resources/RunCppCheck-2.17.0.sh	Fri Jul 11 17:33:28 2025 +0200
@@ -9,7 +9,7 @@
 fi
 
 cat <<EOF > /tmp/cppcheck-suppressions.txt
-nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:321
+nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:322
 stlFindInsert:../../OrthancFramework/Sources/DicomFormat/DicomMap.cpp:1525
 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:166
 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:74
--- a/OrthancServer/Resources/RunCppCheck.sh	Fri Jul 11 17:27:37 2025 +0200
+++ b/OrthancServer/Resources/RunCppCheck.sh	Fri Jul 11 17:33:28 2025 +0200
@@ -12,7 +12,7 @@
 constParameter:../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp
 knownArgument:../../OrthancFramework/UnitTestsSources/ImageTests.cpp
 knownConditionTrueFalse:../../OrthancServer/Plugins/Engine/OrthancPlugins.cpp
-nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:321
+nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:322
 stlFindInsert:../../OrthancFramework/Sources/DicomFormat/DicomMap.cpp:1525
 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:166
 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:74