commit 8e7d7a30b496a726c72329e74d054f5b859b0d9e
author Shannon Woods <shannonwoods@chromium.org> Tue Sep 02 17:09:08 2014 -0400
committer Shannon Woods <shannonwoods@chromium.org> Tue Sep 02 21:36:21 2014 +0000
tree 1609def6e26857b32dedf760c8a027d270b97eff
parent 685dd27a259cfa0127b20a32f223d00a7c020ef1

Fix use of references with va_start

BUG=angle:736

va_start behavior is undefined if the second parameter is a
function, array, or reference type. clang produces a warning
for this, while MSVC does not.

Change-Id: I0bc2805e312e3542aac816f10a257e2f1cfad128
Reviewed-on: https://chromium-review.googlesource.com/216010
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Tested-by: Nico Weber <thakis@chromium.org>

src/common/angleutils.cpp

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

src/common/angleutils.h

diff --git a/src/common/angleutils.h b/src/common/angleutils.h
index e85237e..50a4132 100644
--- a/src/common/angleutils.h
+++ b/src/common/angleutils.h
@@ -132,8 +132,8 @@
     return strstr.str();
 }
 
-std::string FormatString(const std::string &fmt, va_list vararg);
-std::string FormatString(const std::string &fmt, ...);
+std::string FormatString(const char *fmt, va_list vararg);
+std::string FormatString(const char *fmt, ...);
 
 #if defined(_MSC_VER)
 #define snprintf _snprintf

src/libGLESv2/Error.cpp

diff --git a/src/libGLESv2/Error.cpp b/src/libGLESv2/Error.cpp
index 4522d17..cc7d17e 100644
--- a/src/libGLESv2/Error.cpp
+++ b/src/libGLESv2/Error.cpp
@@ -22,7 +22,7 @@
 {
 }
 
-Error::Error(GLenum errorCode, const std::string &msg, ...)
+Error::Error(GLenum errorCode, const char *msg, ...)
     : mCode(errorCode),
       mMessage()
 {

src/libGLESv2/Error.h

diff --git a/src/libGLESv2/Error.h b/src/libGLESv2/Error.h
index 787fbd8..b70b5a5 100644
--- a/src/libGLESv2/Error.h
+++ b/src/libGLESv2/Error.h
@@ -20,7 +20,7 @@
 {
   public:
     explicit Error(GLenum errorCode);
-    Error(GLenum errorCode, const std::string &msg, ...);
+    Error(GLenum errorCode, const char *msg, ...);
     Error(const Error &other);
     Error &operator=(const Error &other);