Mercurial > hg > orthanc

changeset 5072:b23a4bb18065

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replaced bzero() by memset()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 15 Aug 2022 22:13:39 +0200
parents 8fbe84997e23
children 859f3668c181
files OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.7.cmake OrthancFramework/Sources/DicomNetworking/Internals/FindScp.cpp OrthancFramework/Sources/DicomNetworking/Internals/GetScp.cpp OrthancFramework/Sources/DicomNetworking/Internals/MoveScp.cpp
diffstat 4 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.7.cmake	Mon Aug 15 18:25:28 2022 +0200
+++ b/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.7.cmake	Mon Aug 15 22:13:39 2022 +0200
@@ -147,6 +147,10 @@
 # "dcmtls/libsrc/tlslayer.cc"). This must be done before the
 # invokation of "configure_file()"!
 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENSSL)
+  # The "CHECK_FUNCTIONWITHHEADER_EXISTS()" provided by DCMTK only
+  # works with the system-wide version of OpenSSL. If statically
+  # linking against OpenSSL, we manually provide information about
+  # OpenSSL 3.0.x
   set(HAVE_OPENSSL_PROTOTYPE_DH_BITS 1)
   set(HAVE_OPENSSL_PROTOTYPE_EVP_PKEY_BASE_ID 1)
   set(HAVE_OPENSSL_PROTOTYPE_SSL_CTX_GET0_PARAM 1)
--- a/OrthancFramework/Sources/DicomNetworking/Internals/FindScp.cpp	Mon Aug 15 18:25:28 2022 +0200
+++ b/OrthancFramework/Sources/DicomNetworking/Internals/FindScp.cpp	Mon Aug 15 22:13:39 2022 +0200
@@ -202,7 +202,7 @@
       assert(response != NULL);
       assert(requestIdentifiers != NULL);
       
-      bzero(response, sizeof(T_DIMSE_C_FindRSP));
+      memset(response, 0, sizeof(T_DIMSE_C_FindRSP));
       *statusDetail = NULL;
 
       std::string sopClassUid(request->AffectedSOPClassUID);
--- a/OrthancFramework/Sources/DicomNetworking/Internals/GetScp.cpp	Mon Aug 15 18:25:28 2022 +0200
+++ b/OrthancFramework/Sources/DicomNetworking/Internals/GetScp.cpp	Mon Aug 15 22:13:39 2022 +0200
@@ -198,7 +198,7 @@
       assert(responseIdentifiers != NULL);
       assert(requestIdentifiers != NULL);
       
-      bzero(response, sizeof(T_DIMSE_C_GetRSP));
+      memset(response, 0, sizeof(T_DIMSE_C_GetRSP));
       *statusDetail = NULL;
       *responseIdentifiers = NULL;   
 
--- a/OrthancFramework/Sources/DicomNetworking/Internals/MoveScp.cpp	Mon Aug 15 18:25:28 2022 +0200
+++ b/OrthancFramework/Sources/DicomNetworking/Internals/MoveScp.cpp	Mon Aug 15 22:13:39 2022 +0200
@@ -162,7 +162,7 @@
       assert(response != NULL);
       assert(requestIdentifiers != NULL);
       
-      bzero(response, sizeof(T_DIMSE_C_MoveRSP));
+      memset(response, 0, sizeof(T_DIMSE_C_MoveRSP));
       *statusDetail = NULL;
       *responseIdentifiers = NULL;