| Index: base/strings/stringprintf.cc
|
| diff --git a/base/strings/stringprintf.cc b/base/strings/stringprintf.cc
|
| index 537873d71c844435a71999c00d3cd5f7d6700565..9c74f6cf53cb67d5828de76e3371d2d5026386de 100644
|
| --- a/base/strings/stringprintf.cc
|
| +++ b/base/strings/stringprintf.cc
|
| @@ -29,15 +29,6 @@ inline int vsnprintfT(char* buffer,
|
| return base::vsnprintf(buffer, buf_size, format, argptr);
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -inline int vsnprintfT(wchar_t* buffer,
|
| - size_t buf_size,
|
| - const wchar_t* format,
|
| - va_list argptr) {
|
| - return base::vswprintf(buffer, buf_size, format, argptr);
|
| -}
|
| -#endif
|
| -
|
| // Templatized backend for StringPrintF/StringAppendF. This does not finalize
|
| // the va_list, the caller is expected to do that.
|
| template <class StringType>
|
| @@ -52,9 +43,7 @@ static void StringAppendVT(StringType* dst,
|
| va_list ap_copy;
|
| va_copy(ap_copy, ap);
|
|
|
| -#if !defined(OS_WIN)
|
| ScopedClearErrno clear_errno;
|
| -#endif
|
| int result = vsnprintfT(stack_buf, arraysize(stack_buf), format, ap_copy);
|
| va_end(ap_copy);
|
|
|
| @@ -68,17 +57,10 @@ static void StringAppendVT(StringType* dst,
|
| int mem_length = arraysize(stack_buf);
|
| while (true) {
|
| if (result < 0) {
|
| -#if defined(OS_WIN)
|
| - // On Windows, vsnprintfT always returns the number of characters in a
|
| - // fully-formatted string, so if we reach this point, something else is
|
| - // wrong and no amount of buffer-doubling is going to fix it.
|
| - return;
|
| -#else
|
| if (errno != 0 && errno != EOVERFLOW)
|
| return;
|
| // Try doubling the buffer size.
|
| mem_length *= 2;
|
| -#endif
|
| } else {
|
| // We need exactly "result + 1" characters.
|
| mem_length = result + 1;
|
| @@ -119,17 +101,6 @@ std::string StringPrintf(const char* format, ...) {
|
| return result;
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -std::wstring StringPrintf(const wchar_t* format, ...) {
|
| - va_list ap;
|
| - va_start(ap, format);
|
| - std::wstring result;
|
| - StringAppendV(&result, format, ap);
|
| - va_end(ap);
|
| - return result;
|
| -}
|
| -#endif
|
| -
|
| std::string StringPrintV(const char* format, va_list ap) {
|
| std::string result;
|
| StringAppendV(&result, format, ap);
|
| @@ -145,18 +116,6 @@ const std::string& SStringPrintf(std::string* dst, const char* format, ...) {
|
| return *dst;
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -const std::wstring& SStringPrintf(std::wstring* dst,
|
| - const wchar_t* format, ...) {
|
| - va_list ap;
|
| - va_start(ap, format);
|
| - dst->clear();
|
| - StringAppendV(dst, format, ap);
|
| - va_end(ap);
|
| - return *dst;
|
| -}
|
| -#endif
|
| -
|
| void StringAppendF(std::string* dst, const char* format, ...) {
|
| va_list ap;
|
| va_start(ap, format);
|
| @@ -164,23 +123,8 @@ void StringAppendF(std::string* dst, const char* format, ...) {
|
| va_end(ap);
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -void StringAppendF(std::wstring* dst, const wchar_t* format, ...) {
|
| - va_list ap;
|
| - va_start(ap, format);
|
| - StringAppendV(dst, format, ap);
|
| - va_end(ap);
|
| -}
|
| -#endif
|
| -
|
| void StringAppendV(std::string* dst, const char* format, va_list ap) {
|
| StringAppendVT(dst, format, ap);
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -void StringAppendV(std::wstring* dst, const wchar_t* format, va_list ap) {
|
| - StringAppendVT(dst, format, ap);
|
| -}
|
| -#endif
|
| -
|
| } // namespace base
|
|
|