Modified getInputFileDataAsCode() and getInputFileChunkAsCode() to output data to a stream instead of returning a string

Author: end2endzone

src/bin2cpp/ArrayGenerator.cpp

@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string>
 #include <stdlib.h>
+#include <sstream>
 
 #include "rapidassist/code_cpp.h"
 #include "rapidassist/strings.h"
@@ -94,8 +95,11 @@ namespace bin2cpp
     if (!ra::filesystem::FileExists(mContext.inputFilePath.c_str()) )
       return false;
 
-    std::string output = getInputFileDataAsCode();
-    printf("\"%s\"", output.c_str());
+    std::ostringstream output_stream;
+    writeInputFileDataAsCode(output_stream);
+    std::string str = output_stream.str();
+
+    printf("\"%s\"", str.c_str());
 
     return true;
   }
@@ -185,7 +189,7 @@ namespace bin2cpp
     return write_success;
   }
 
-  std::string ArrayGenerator::getInputFileChunkAsCode(const unsigned char * buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk)
+  void ArrayGenerator::writeInputFileChunkAsCode(const unsigned char * buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk, std::ostream& output)
   {
     size_t indentation = 0;
 
@@ -196,18 +200,19 @@ namespace bin2cpp
     else if ( mContext.code == CodeGenerationEnum::CODE_GENERATION_C )
       indentation = 4;
 
-    std::string output;
+    std::string str;
     if ( indentation )
-      output += std::string(indentation, ' ');
+      str += std::string(indentation, ' ');
     if ( mContext.plainOutput )
-      output += "\"";
-    output += ra::code::cpp::ToCppCharactersArray(buffer, buffer_size);
+      str += "\"";
+    str += ra::code::cpp::ToCppCharactersArray(buffer, buffer_size);
     if ( mContext.plainOutput )
-      output += "\"";
+      str += "\"";
     if ( !is_last_chunk )
-      output += ",";
-    output += "\n";
-    return output;
+      str += ",";
+    str += "\n";
+
+    output << str;
   }
 
 }; //bin2cpp

src/bin2cpp/ArrayGenerator.h

@@ -43,7 +43,7 @@ namespace bin2cpp
     virtual bool createCppSourceFile(const char * file_path);
     virtual bool createCSourceFile(const char * file_path);
     virtual bool printFileContent();
-    virtual std::string getInputFileChunkAsCode(const unsigned char * buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk);
+    virtual void writeInputFileChunkAsCode(const unsigned char * buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk, std::ostream& output);
   };
 
 }; //bin2cpp

src/bin2cpp/BaseGenerator.cpp

@@ -113,7 +113,7 @@ namespace bin2cpp
   {
     if ( name == "bin2cpp_insert_input_file_as_code" )
     {
-      output << getInputFileDataAsCode();
+      writeInputFileDataAsCode(output);
       return true;
     }
 
@@ -427,25 +427,18 @@ namespace bin2cpp
     return mContext.headerFilename;
   }
 
-  std::string BaseGenerator::getInputFileDataAsCode()
+  void BaseGenerator::writeInputFileDataAsCode(std::ostream& output)
   {
-    std::string output;
-
     //check if input file exists
     FILE* fin = fopen(mContext.inputFilePath.c_str(), "rb");
     if ( !fin )
-      return "";
+      return;
 
     uint64_t fileSize = ra::filesystem::GetFileSize64(mContext.inputFilePath.c_str());
     size_t chunkCount = fileSize / mContext.chunkSize;
     if ( fileSize % mContext.chunkSize > 0 )
       chunkCount++;
 
-    // Try to optimize the output buffer string.
-    // Initialize the output buffer to be around twice the size of the input file.
-    // Most files will output as hexadecimal values which is roughly doubling the number of bytes of the output file.
-    output.reserve(2 * fileSize);
-
     //create buffer for each chunks from input buffer
     int numLinePrinted = 0;
     size_t chunkIndex = 0;
@@ -459,9 +452,8 @@ namespace bin2cpp
 
       if ( readSize > 0 )
       {
-        //output
-        std::string encoded_chunk = getInputFileChunkAsCode(buffer, readSize, chunkIndex, chunkCount, isLastChunk);
-        output += encoded_chunk;
+        //append chunk as code in output stream
+        writeInputFileChunkAsCode(buffer, readSize, chunkIndex, chunkCount, isLastChunk, output);
 
         numLinePrinted++;
         chunkIndex++;
@@ -472,13 +464,10 @@ namespace bin2cpp
     buffer = NULL;
 
     fclose(fin);
-
-    return output;
   }
 
-  std::string BaseGenerator::getInputFileChunkAsCode(const unsigned char* buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk)
+  void BaseGenerator::writeInputFileChunkAsCode(const unsigned char* buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk, std::ostream& output)
   {
-    return "";
   }
 
   bool BaseGenerator::createCppHeaderFile(const char * header_file_path)

src/bin2cpp/BaseGenerator.h

@@ -73,8 +73,8 @@ namespace bin2cpp
     virtual std::string getFileClassFileName();
     virtual std::string getFileClassFilePath();
     virtual std::string getCppHeaderIncludePath();
-    virtual std::string getInputFileDataAsCode();
-    virtual std::string getInputFileChunkAsCode(const unsigned char * buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk);
+    virtual void writeInputFileDataAsCode(std::ostream& output);
+    virtual void writeInputFileChunkAsCode(const unsigned char * buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk, std::ostream& output);
 
     //attributes
     Context mContext;

src/bin2cpp/SegmentGenerator.cpp

@@ -185,7 +185,7 @@ namespace bin2cpp
     return write_success;
   }
 
-  std::string SegmentGenerator::getInputFileChunkAsCode(const unsigned char* buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk)
+  void SegmentGenerator::writeInputFileChunkAsCode(const unsigned char* buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk, std::ostream& output)
   {
     size_t indentation = 0;
 
@@ -196,9 +196,9 @@ namespace bin2cpp
     else if ( mContext.code == CodeGenerationEnum::CODE_GENERATION_C )
       indentation = 2;
 
-    std::string output;
+    std::string str;
     if ( indentation )
-      output += std::string(indentation, ' ');
+      str += std::string(indentation, ' ');
 
     //convert to cpp string
     std::string code;
@@ -218,26 +218,26 @@ namespace bin2cpp
     }
     else if ( mContext.code == CodeGenerationEnum::CODE_GENERATION_CPP )
     {
-      output += "mBuffer.append(\"";
-      output += code;
-      output += "\", ";
-      output += ra::strings::ToString(buffer_size);
-      output += ");";
+      str += "mBuffer.append(\"";
+      str += code;
+      str += "\", ";
+      str += ra::strings::ToString(buffer_size);
+      str += ");";
     }
     else if ( mContext.code == CodeGenerationEnum::CODE_GENERATION_C )
     {
-      output += "memcpy(next, \"";
-      output += code;
-      output += "\", ";
-      output += ra::strings::ToString(buffer_size);
-      output += "); next += ";
-      output += ra::strings::ToString(buffer_size);
-      output += ";";
+      str += "memcpy(next, \"";
+      str += code;
+      str += "\", ";
+      str += ra::strings::ToString(buffer_size);
+      str += "); next += ";
+      str += ra::strings::ToString(buffer_size);
+      str += ";";
     }
 
-    output += "\n";
+    str += "\n";
 
-    return output;
+    output << str;
   }
 
 }; //bin2cpp

src/bin2cpp/SegmentGenerator.h

@@ -42,7 +42,7 @@ namespace bin2cpp
     virtual const char * getName() const;
     virtual bool createCppSourceFile(const char * file_path);
     virtual bool createCSourceFile(const char* file_path);
-    virtual std::string getInputFileChunkAsCode(const unsigned char* buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk);
+    virtual void writeInputFileChunkAsCode(const unsigned char* buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk, std::ostream& output);
   };
 
 }; //bin2cpp

src/bin2cpp/StringGenerator.cpp

@@ -172,7 +172,7 @@ namespace bin2cpp
     return write_success;
   }
 
-  std::string StringGenerator::getInputFileChunkAsCode(const unsigned char* buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk)
+  void StringGenerator::writeInputFileChunkAsCode(const unsigned char* buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk, std::ostream& output)
   {
     size_t indentation = 0;
 
@@ -183,30 +183,30 @@ namespace bin2cpp
     else if ( mContext.code == CodeGenerationEnum::CODE_GENERATION_C )
       indentation = 4;
 
-    std::string output;
+    std::string str;
     if ( indentation )
-      output += std::string(indentation, ' ');
+      str += std::string(indentation, ' ');
 
-    output += "\"";
+    str += "\"";
 
     //convert to cpp string
     switch ( mContext.cppEncoder )
     {
     case CPP_ENCODER_HEX:
-      output += ra::code::cpp::ToHexString(buffer, buffer_size);
+      str += ra::code::cpp::ToHexString(buffer, buffer_size);
       break;
     case CPP_ENCODER_OCT:
     default:
-      output += ra::code::cpp::ToOctString(buffer, buffer_size, false);
+      str += ra::code::cpp::ToOctString(buffer, buffer_size, false);
       break;
     };
 
-    output += "\"";
+    str += "\"";
     if ( is_last_chunk )
-      output += ";";
-    output += "\n";
+      str += ";";
+    str += "\n";
 
-    return output;
+    output << str;
   }
 
 }; //bin2cpp

src/bin2cpp/StringGenerator.h

@@ -41,7 +41,7 @@ namespace bin2cpp
     virtual const char * getName() const;
     virtual bool createCppSourceFile(const char * file_path);
     virtual bool createCSourceFile(const char* file_path);
-    virtual std::string getInputFileChunkAsCode(const unsigned char* buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk);
+    virtual void writeInputFileChunkAsCode(const unsigned char* buffer, size_t buffer_size, size_t index, size_t count, bool is_last_chunk, std::ostream& output);
   };
 
 }; //bin2cpp