[libcxx-commits] [PATCH] D118187: [libcxx] [Windows] Use the standard vsnprintf instead of _vsnprintf

[Martin Storsjö via Phabricator via libcxx-commits]

mstorsjo created this revision.
mstorsjo added a reviewer: ldionne.
mstorsjo requested review of this revision.
Herald added a project: libc++.
Herald added a reviewer: libc++.

In ancient Microsoft C runtimes, there might only have been
a nonstandard `_vsnprintf` instead of the standard `vsnprintf`, but
in modern versions (the only ones relevant for libc++), both
are available.

In MinGW configurations built with `__USE_MINGW_ANSI_STDIO=1` (as it
is built in CI), `vsnprintf` provides a more standards compliant
behaviour than what Microsoft's CRT provides, while `_vsnprintf` retains
the Microsoft C runtime specific quirks.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D118187

Files:
  libcxx/src/support/win32/support.cpp
  libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp


Index: libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
===================================================================
--- libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
+++ libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
@@ -12,7 +12,7 @@
 
 // iter_type put(iter_type s, ios_base& iob, char_type fill, double v) const;
 
-// XFAIL: LIBCXX-WINDOWS-FIXME
+// XFAIL: msvc
 // XFAIL: LIBCXX-AIX-FIXME
 
 #include <locale>
Index: libcxx/src/support/win32/support.cpp
===================================================================
--- libcxx/src/support/win32/support.cpp
+++ libcxx/src/support/win32/support.cpp
@@ -23,7 +23,7 @@
     // Query the count required.
     va_list ap_copy;
     va_copy(ap_copy, ap);
-    int count = _vsnprintf( NULL, 0, format, ap_copy );
+    int count = vsnprintf( NULL, 0, format, ap_copy );
     va_end(ap_copy);
     if (count < 0)
         return count;
@@ -33,7 +33,7 @@
         return -1;
     // If we haven't used exactly what was required, something is wrong.
     // Maybe bug in vsnprintf. Report the error and return.
-    if (_vsnprintf(p, buffer_size, format, ap) != count) {
+    if (vsnprintf(p, buffer_size, format, ap) != count) {
         free(p);
         return -1;
     }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D118187.403029.patch
Type: text/x-patch
Size: 1451 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220125/a0251891/attachment.bin>