Fix use of references with va_start

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

@@ -132,8 +132,8 @@ inline std::string Str(int i)
     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

@@ -22,7 +22,7 @@ Error::Error(GLenum errorCode)
 {
 }
 
-Error::Error(GLenum errorCode, const std::string &msg, ...)
+Error::Error(GLenum errorCode, const char *msg, ...)
     : mCode(errorCode),
       mMessage()
 {

src/libGLESv2/Error.h

@@ -20,7 +20,7 @@ class Error
 {
   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);