Mercurial > hg > orthanc

changeset 6599:4f5811d75978

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
for filenames in ZipWriter, replace "char*" by "std::string"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 20 Feb 2026 16:55:34 +0100
parents 24f00121619f
children 3f857772f59a
files OrthancFramework/Sources/Compression/HierarchicalZipWriter.cpp OrthancFramework/Sources/Compression/HierarchicalZipWriter.h OrthancFramework/Sources/Compression/ZipWriter.cpp OrthancFramework/Sources/Compression/ZipWriter.h
diffstat 4 files changed, 19 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/Compression/HierarchicalZipWriter.cpp	Fri Feb 20 16:47:30 2026 +0100
+++ b/OrthancFramework/Sources/Compression/HierarchicalZipWriter.cpp	Fri Feb 20 16:55:34 2026 +0100
@@ -85,7 +85,7 @@
     return result;
   }
 
-  std::string HierarchicalZipWriter::Index::EnsureUniqueFilename(const char* filename)
+  std::string HierarchicalZipWriter::Index::EnsureUniqueFilename(const std::string& filename)
   {
     std::string standardized = KeepAlphanumeric(filename);
 
@@ -122,12 +122,12 @@
     return stack_.size() == 1;
   }
 
-  std::string HierarchicalZipWriter::Index::OpenFile(const char* name)
+  std::string HierarchicalZipWriter::Index::OpenFile(const std::string& name)
   {
     return GetCurrentDirectoryPath() + EnsureUniqueFilename(name);
   }
 
-  void HierarchicalZipWriter::Index::OpenDirectory(const char* name)
+  void HierarchicalZipWriter::Index::OpenDirectory(const std::string& name)
   {
     std::string d = EnsureUniqueFilename(name);
 
@@ -199,13 +199,13 @@
     return writer_.IsAppendToExisting();
   }
 
-  void HierarchicalZipWriter::OpenFile(const char* name)
+  void HierarchicalZipWriter::OpenFile(const std::string& name)
   {
     std::string p = indexer_.OpenFile(name);
     writer_.OpenFile(p.c_str());
   }
 
-  void HierarchicalZipWriter::OpenDirectory(const char* name)
+  void HierarchicalZipWriter::OpenDirectory(const std::string& name)
   {
     indexer_.OpenDirectory(name);
   }
@@ -220,12 +220,13 @@
     return indexer_.GetCurrentDirectoryPath();
   }
 
-  void HierarchicalZipWriter::Write(const void *data, size_t length)
+  void HierarchicalZipWriter::Write(const void *data,
+                                    size_t length)
   {
     writer_.Write(data, length);
   }
 
-  void HierarchicalZipWriter::Write(const std::string &data)
+  void HierarchicalZipWriter::Write(const std::string& data)
   {
     writer_.Write(data);
   }
--- a/OrthancFramework/Sources/Compression/HierarchicalZipWriter.h	Fri Feb 20 16:47:30 2026 +0100
+++ b/OrthancFramework/Sources/Compression/HierarchicalZipWriter.h	Fri Feb 20 16:55:34 2026 +0100
@@ -60,7 +60,7 @@
   
       Stack stack_;
 
-      std::string EnsureUniqueFilename(const char* filename);
+      std::string EnsureUniqueFilename(const std::string& name);
 
     public:
       Index();
@@ -69,9 +69,9 @@
 
       bool IsRoot() const;
 
-      std::string OpenFile(const char* name);
+      std::string OpenFile(const std::string& name);
 
-      void OpenDirectory(const char* name);
+      void OpenDirectory(const std::string& name);
 
       void CloseDirectory();
 
@@ -103,9 +103,9 @@
     
     bool IsAppendToExisting() const;
     
-    void OpenFile(const char* name);
+    void OpenFile(const std::string& name);
 
-    void OpenDirectory(const char* name);
+    void OpenDirectory(const std::string& name);
 
     void CloseDirectory();
 
--- a/OrthancFramework/Sources/Compression/ZipWriter.cpp	Fri Feb 20 16:47:30 2026 +0100
+++ b/OrthancFramework/Sources/Compression/ZipWriter.cpp	Fri Feb 20 16:55:34 2026 +0100
@@ -603,7 +603,7 @@
     return compressionLevel_;
   }
 
-  void ZipWriter::OpenFile(const char* filename)
+  void ZipWriter::OpenFile(const std::string& filename)
   {
     Open();
 
@@ -614,7 +614,7 @@
 
     if (isZip64_)
     {
-      result = zipOpenNewFileInZip64(pimpl_->file_, filename,
+      result = zipOpenNewFileInZip64(pimpl_->file_, filename.c_str(),
                                      &zfi,
                                      NULL,   0,
                                      NULL,   0,
@@ -624,7 +624,7 @@
     }
     else
     {
-      result = zipOpenNewFileInZip(pimpl_->file_, filename,
+      result = zipOpenNewFileInZip(pimpl_->file_, filename.c_str(),
                                    &zfi,
                                    NULL,   0,
                                    NULL,   0,
--- a/OrthancFramework/Sources/Compression/ZipWriter.h	Fri Feb 20 16:47:30 2026 +0100
+++ b/OrthancFramework/Sources/Compression/ZipWriter.h	Fri Feb 20 16:55:34 2026 +0100
@@ -164,9 +164,10 @@
 
     const boost::filesystem::path& GetOutputPath() const;
 
-    void OpenFile(const char* filename);
+    void OpenFile(const std::string& filename);
 
-    void Write(const void* data, size_t length);
+    void Write(const void* data,
+               size_t length);
 
     void Write(const std::string& data);