Use C++ headers and reserved naming for vasprintf

Author: zibi2

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

@@ -10,38 +10,38 @@
 #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
 
 _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;
 }