* Fixed ci/appveyor/version_info_update.bat script which was hardcoding application number to v1.2.3

* Modified output of testfilegenerator to only show size in other units if size is > than 1024 bytes
* Modified output of bin2cpp to not show "into file 'foo.h'" which is not required if the next 2 lines says 'writing file foo.h'.

Author: end2endzone

ci/appveyor/version_info_update.bat

@@ -10,8 +10,6 @@ echo REPOSITORY_ROOT=%REPOSITORY_ROOT%
 echo done.
 echo.
 
-set APPVEYOR_BUILD_VERSION=1.2.3
-
 REM **************** version_info.bat ****************
 set OUTPUTFILE=%REPOSITORY_ROOT%\version_info.bat
 echo Updating %OUTPUTFILE%...

src/common.cpp

@@ -467,6 +467,14 @@ namespace bin2cpp
     return str;
   }
 
+  std::string& operator<<(std::string& str, const size_t & value)
+  {
+    std::stringstream out;
+    out << value;
+    str.append( out.str() );
+    return str;
+  }
+
   std::string& operator<<(std::string& str, const uint64_t & value)
   {
     std::stringstream out;

src/common.h

@@ -181,6 +181,13 @@ namespace bin2cpp
   ///<return>Returns the given string.<return>
   std::string& operator<<(std::string& str, const int & value);
 
+  ///<summary>
+  ///Streams a value to an existing string.
+  ///</summary>
+  ///<param name="value">The value to append to the given string.</param>
+  ///<return>Returns the given string.<return>
+  std::string& operator<<(std::string& str, const size_t & value);
+
   ///<summary>
   ///Streams a value to an existing string.
   ///</summary>

src/main.cpp

@@ -23,6 +23,8 @@
 #include <windows.h>
 #endif
 
+using namespace bin2cpp;
+
 void printHeader()
 {
   printf("bin2cpp v%s - Convert binary files into C++ source code.\n", bin2cpp::getVersionString() );
@@ -194,20 +196,19 @@ int main(int argc, char* argv[])
   }
 
   // printing info
-  std::string chunkInfo = "";
+  std::string info;
+  info << "Embedding \"" << inputFile << "\"";
   if (chunkSize != DEFAULT_CHUNK_SIZE)
   {
-    std::stringstream ss;
-    ss << " using chunks of ";
-    ss << chunkSize;
-    ss << " bytes";
-    chunkInfo.append(ss.str());
+    info << " using chunks of ";
+    info << chunkSize;
+    info << " bytes";
   }
-  std::string overrideInfo = "";
   if (overrideExisting)
-    overrideInfo = " overriding existing files";
-  bin2cpp::log(bin2cpp::LOG_INFO, "Embedding \"%s\" into \"%s\"%s%s...", inputFile.c_str(), headerFilename.c_str(), chunkInfo.c_str(), overrideInfo.c_str());
-  
+    info << " overriding existing files";
+  info << "...";
+  bin2cpp::log(bin2cpp::LOG_INFO, info.c_str());
+
   //generate header
   std::string outputHeaderPath = outputFolder + "\\" + headerFilename;
   bin2cpp::log(bin2cpp::LOG_INFO, "Writing file \"%s\"...", outputHeaderPath.c_str());

test/testfilegenerator.cpp

@@ -11,11 +11,23 @@
 #include "common.h"
 #include "..\version_info.h"
 
+using namespace bin2cpp;
+
 const char * getVersionString()
 {
   return BINCPP_VERSION;
 }
 
+std::string getSizeAdditionalInfo(int size)
+{
+  std::string output;
+  if (size > 1024)
+  {
+    output << " (" << getUserFriendlySize(size) << ")";
+  }
+  return output;
+}
+
 void printVersion()
 {
   printf("testfilegenerator v%s\n", bin2cpp::getVersionString() );
@@ -152,10 +164,9 @@ int main(int argc, char **argv)
   }
 
   //building info string
-  static const int BUFFER_SIZE = 4096;
-  char infostr[BUFFER_SIZE];
-  sprintf(infostr, "Writing %d bytes (%s) of %s data into '%s'.", size, bin2cpp::getUserFriendlySize(size).c_str(), fill.c_str(), file.c_str());
-  bin2cpp::log(bin2cpp::LOG_INFO, "%s", infostr);
+  std::string infostr;
+  infostr << "Writing " << size << " bytes" << getSizeAdditionalInfo(size) << " of " << fill << " data into \'" << file << "\'.";
+  bin2cpp::log(bin2cpp::LOG_INFO, "%s", infostr.c_str());
 
   //process with file generation
   FILE * f = fopen(file.c_str(), "wb");