commit 7c09b929f29a33e25c118ad12dda669249d44db6
author Daniel Dunbar <daniel@zuster.org> Fri Jan 27 08:44:27 2017 -0800
committer GitHub <noreply@github.com> Fri Jan 27 08:44:27 2017 -0800
tree bd18d648e1205b259f94c78614cf7f0531e53a6f
parent 7ed9a9c93461fb1cff8cd0f00e6789df76d5398a
parent 8a6febe0dbdfecb4693be01eecd6260a3da38394

Merge pull request #101 from hughbe/msvc-cleanup

Fixup some MSVC warnings

lib/Commands/BuildSystemCommand.cpp

diff --git a/lib/Commands/BuildSystemCommand.cpp b/lib/Commands/BuildSystemCommand.cpp
index 6588c34..5b9e2bd 100644
--- a/lib/Commands/BuildSystemCommand.cpp
+++ b/lib/Commands/BuildSystemCommand.cpp
@@ -382,7 +382,7 @@
     } else if (option == "--no-output") {
       showOutput = false;
     } else {
-      fprintf(stderr, "\error: %s: invalid option: '%s'\n\n",
+      fprintf(stderr, "error: %s: invalid option: '%s'\n\n",
               getProgramName(), option.c_str());
       parseUsage(1);
     }

lib/Commands/NinjaBuildCommand.cpp

diff --git a/lib/Commands/NinjaBuildCommand.cpp b/lib/Commands/NinjaBuildCommand.cpp
index 5e13563..a3e972d 100644
--- a/lib/Commands/NinjaBuildCommand.cpp
+++ b/lib/Commands/NinjaBuildCommand.cpp
@@ -71,7 +71,7 @@
     return "unable to format message";
   }
 
-  std::string result = std::string(count, NULL);
+  std::string result = std::string(count, '\0');
   if (vsnprintf(const_cast<char *>(result.c_str()), count + 1, fmt, ap2) < 0) {
     return "unable to format message";
   }