lib/System/Win32/ThreadLocal.inc: Suppress "unused" warning on -Asserts.

[oota-llvm.git] / lib / System / Win32 / Path.inc

diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc
index 42e58a4708501e415a57d3ad5e5b3f63f53477aa..4a6dbd3ddf29999aa41c9e1fbe1613afdc3ee9f6 100644 (file)
--- a/lib/System/Win32/Path.inc
+++ b/lib/System/Win32/Path.inc
@@ -722,7 +722,7 @@ Path::eraseFromDisk(bool remove_contents, std::string *ErrStr) const {
 
 bool Path::getMagicNumber(std::string& Magic, unsigned len) const {
   assert(len < 1024 && "Request for magic string too long");
-  char* buf = (char*) alloca(1 + len);
+  char* buf = reinterpret_cast<char*>(alloca(len));
 
   HANDLE h = CreateFile(path.c_str(),
                         GENERIC_READ,
@@ -741,8 +741,7 @@ bool Path::getMagicNumber(std::string& Magic, unsigned len) const {
   if (!ret || nRead != len)
     return false;
 
-  buf[len] = '\0';
-  Magic = buf;
+  Magic = std::string(buf, len);
   return true;
 }