Use C++ headers and reserved naming for vasprintf and fix CI/formatting

Author: zibi2

libcxx/include/__locale_dir/locale_base_api.h

@@ -132,7 +132,7 @@ _LIBCPP_PUSH_MACROS
 //       (by providing global non-reserved names) and the new API. As we move individual platforms
 //       towards the new way of defining the locale base API, this should disappear since each platform
 //       will define those directly.
-#    if defined(_AIX) 
+#    if defined(_AIX)
 #      include <__locale_dir/locale_base_api/ibm.h>
 #    elif defined(__OpenBSD__)
 #      include <__locale_dir/locale_base_api/openbsd.h>

libcxx/include/__locale_dir/support/zos.h

@@ -32,7 +32,6 @@ struct __locale_guard {
   _LIBCPP_HIDE_FROM_ABI __locale_guard(locale_t& __loc) : __old_loc_(std::uselocale(__loc)) {}
 
   _LIBCPP_HIDE_FROM_ABI ~__locale_guard() {
-    // if (__old_loc_)
     if (__old_loc_ != (locale_t)0)
       std::uselocale(__old_loc_);
   }
@@ -299,7 +298,7 @@ _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_ATTRIBUTE_FORMAT(__printf__, 3, 4) int __as
   va_list __va;
   va_start(__va, __format);
   __locale_guard __current(__loc);
-  int __res = std::__ibm::vasprintf(__s, __format, __va); // non-standard
+  int __res = std::__ibm::__vasprintf(__s, __format, __va); // non-standard
   va_end(__va);
   return __res;
 }

libcxx/include/__support/ibm/vasprintf.h

@@ -9,39 +9,39 @@
 #ifndef _LIBCPP___SUPPORT_IBMVASPRINTF_H
 #define _LIBCPP___SUPPORT_IBMVASPRINTF_H
 
-#include <cstdlib>  // malloc, realloc
-#include <stdarg.h> // va_copy, va_end
-#include <stdio.h>  // vsnprintf
+#include <cstdarg> // va_copy, va_end
+#include <cstdio>  // vsnprintf
+#include <cstdlib> // malloc, realloc
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __ibm {
 
 inline _LIBCPP_HIDE_FROM_ABI
-_LIBCPP_ATTRIBUTE_FORMAT(__printf__, 2, 0) int vasprintf(char** strp, const char* fmt, va_list ap) {
+_LIBCPP_ATTRIBUTE_FORMAT(__printf__, 2, 0) int __vasprintf(char** __strp, const char* __fmt, va_list __ap) {
   const size_t buff_size = 256;
-  if ((*strp = (char*)malloc(buff_size)) == nullptr) {
+  if ((*__strp = (char*)std::malloc(buff_size)) == nullptr) {
     return -1;
   }
 
   va_list ap_copy;
   // va_copy may not be provided by the C library in C++03 mode.
 #if defined(_LIBCPP_CXX03_LANG) && __has_builtin(__builtin_va_copy)
 #  if defined(__MVS__) && !defined(_VARARG_EXT_)
-  __builtin_zos_va_copy(ap_copy, ap);
+  __builtin_zos_va_copy(ap_copy, __ap);
 #  else
-  __builtin_va_copy(ap_copy, ap);
+  __builtin_va_copy(ap_copy, __ap);
 #  endif
 #else
-  va_copy(ap_copy, ap);
+  va_copy(ap_copy, __ap);
 #endif
-  int str_size = vsnprintf(*strp, buff_size, fmt, ap_copy);
+  int str_size = vsnprintf(*__strp, buff_size, __fmt, ap_copy);
   va_end(ap_copy);
 
   if ((size_t)str_size >= buff_size) {
-    if ((*strp = (char*)realloc(*strp, str_size + 1)) == nullptr) {
+    if ((*__strp = (char*)std::realloc(*__strp, str_size + 1)) == nullptr) {
       return -1;
     }
-    str_size = vsnprintf(*strp, str_size + 1, fmt, ap);
+    str_size = vsnprintf(*__strp, str_size + 1, __fmt, __ap);
   }
   return str_size;
 }

libcxx/src/support/ibm/localeconv.cpp

@@ -13,18 +13,17 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-lconv *__libcpp_localeconv_l(locale_t& __l)
-{
+lconv* __libcpp_localeconv_l(locale_t& __l) {
   __locale::__locale_guard __current(__l);
 
-  lconv * lc = localeconv();
+  lconv* lc = localeconv();
   static lconv newlc;
   newlc = *lc;
 
-  enum {max_char_num = 20};
-#define DeepCopy(mbr) \
-  static char buf_##mbr[max_char_num]; \
-  strncpy(buf_##mbr, lc->mbr, max_char_num); \
+  enum { max_char_num = 20 };
+#define DeepCopy(mbr)                                                                                                  \
+  static char buf_##mbr[max_char_num];                                                                                 \
+  strncpy(buf_##mbr, lc->mbr, max_char_num);                                                                           \
   newlc.mbr = buf_##mbr;
 
   DeepCopy(decimal_point);

libcxx/src/support/ibm/mbsnrtowcs.cpp

@@ -23,12 +23,11 @@ namespace __ibm {
 // Returns (size_t) -1 when an invalid sequence is encountered.
 // Leaves *`src` pointing to the next character to convert or NULL
 // if a null character was converted from *`src`.
-size_t mbsnrtowcs(
-    wchar_t* __restrict dst,
-    const char** __restrict src,
-    size_t src_size_bytes,
-    size_t max_dest_chars,
-    mbstate_t* __restrict ps) {
+size_t mbsnrtowcs(wchar_t* __restrict dst,
+                  const char** __restrict src,
+                  size_t src_size_bytes,
+                  size_t max_dest_chars,
+                  mbstate_t* __restrict ps) {
   const size_t terminated_sequence = static_cast<size_t>(0);
   const size_t invalid_sequence    = static_cast<size_t>(-1);
   const size_t incomplete_sequence = static_cast<size_t>(-2);
@@ -101,9 +100,7 @@ size_t mbsnrtowcs(
   return dest_converted;
 }
 
-size_t __libcpp_mbsnrtowcs_l(wchar_t * dest, const char **src, size_t nms,
-                          size_t len, mbstate_t *ps, locale_t l)
-{
+size_t __libcpp_mbsnrtowcs_l(wchar_t* dest, const char** src, size_t nms, size_t len, mbstate_t* ps, locale_t l) {
   __locale::__locale_guard current(l);
   return mbsnrtowcs(dest, src, nms, len, ps);
 }

libcxx/src/support/ibm/wcsnrtombs.cpp

@@ -22,12 +22,11 @@ namespace __ibm {
 // converted from *src, excluding the null terminator.
 // Returns (size_t) -1 if an error occurs and sets errno.
 // If `dst` is NULL, `dst_size_bytes` is ignored and no bytes are copied to `dst`.
-size_t wcsnrtombs(
-    char* __restrict dst,
-    const wchar_t** __restrict src,
-    size_t max_source_chars,
-    size_t dst_size_bytes,
-    mbstate_t* __restrict ps) {
+size_t wcsnrtombs(char* __restrict dst,
+                  const wchar_t** __restrict src,
+                  size_t max_source_chars,
+                  size_t dst_size_bytes,
+                  mbstate_t* __restrict ps) {
   const size_t invalid_wchar = static_cast<size_t>(-1);
 
   size_t source_converted;
@@ -98,9 +97,7 @@ size_t wcsnrtombs(
   return dest_converted;
 }
 
-size_t __libcpp_wcsnrtombs_l(char *dest, const wchar_t **src, size_t nwc,
-                             size_t len, mbstate_t *ps, locale_t l)
-{
+size_t __libcpp_wcsnrtombs_l(char* dest, const wchar_t** src, size_t nwc, size_t len, mbstate_t* ps, locale_t l) {
   __locale::__locale_guard __current(l);
   return wcsnrtombs(dest, src, nwc, len, ps);
 }