Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / angle / src / common / angleutils.cpp

diff --git a/src/third_party/angle/src/common/angleutils.cpp b/src/third_party/angle/src/common/angleutils.cpp
index 2673abf..c1367c4 100644 (file)
--- a/src/third_party/angle/src/common/angleutils.cpp
+++ b/src/third_party/angle/src/common/angleutils.cpp
@@ -5,26 +5,33 @@
 //
 
 #include "common/angleutils.h"
-
+#include "debug.h"
+#include <stdio.h>
 #include <vector>
 
-std::string FormatString(const char *fmt, va_list vararg)
+size_t FormatStringIntoVector(const char *fmt, va_list vararg, std::vector<char>& outBuffer)
 {
-    static std::vector<char> buffer(512);
-
     // Attempt to just print to the current buffer
-    int len = vsnprintf(&buffer[0], buffer.size(), fmt, vararg);
-    if (len < 0 || static_cast<size_t>(len) >= buffer.size())
+    int len = vsnprintf(&(outBuffer.front()), outBuffer.size(), fmt, vararg);
+    if (len < 0 || static_cast<size_t>(len) >= outBuffer.size())
     {
         // Buffer was not large enough, calculate the required size and resize the buffer
         len = vsnprintf(NULL, 0, fmt, vararg);
-        buffer.resize(len + 1);
+        outBuffer.resize(len + 1);
 
         // Print again
-        vsnprintf(&buffer[0], buffer.size(), fmt, vararg);
+        len = vsnprintf(&(outBuffer.front()), outBuffer.size(), fmt, vararg);
     }
+    ASSERT(len >= 0);
+    return static_cast<size_t>(len);
+}
+
+std::string FormatString(const char *fmt, va_list vararg)
+{
+    static std::vector<char> buffer(512);
 
-    return std::string(buffer.data(), len);
+    size_t len = FormatStringIntoVector(fmt, vararg, buffer);
+    return std::string(&buffer[0], len);
 }
 
 std::string FormatString(const char *fmt, ...)