Export vsnprintf_va_copy() and vsnprintf_va_end()

Author: uklotzde

build.rs

@@ -113,13 +113,6 @@ impl bindgen::callbacks::ParseCallbacks for CustomCallbacks {
         if original_item_name == "RS_EMPTY_ARRAY_SENTINEL" {
             return Some("UA_EMPTY_ARRAY_SENTINEL".to_owned());
         }
-        // Rename wrapper function back to its original name. See `wrapper.c` for details.
-        if original_item_name == "RS_vsnprintf" {
-            return Some("vsnprintf".to_owned());
-        }
-        if original_item_name == "RS_va_end" {
-            return Some("va_end".to_owned());
-        }
         None
     }
 }

wrapper.c

@@ -4,10 +4,10 @@
 // such as Microsoft Windows.
 //
 // Other than the standard `vsnprintf()`, this function does not consume the passed
-// `va_list` argument! The caller is responsible for calling `va_end()` on the
+// `va_list` argument! The caller is responsible for calling `vsnprintf_va_end()` on the
 // `va_list` argument eventually.
 #if defined(_MSC_VER) && _MSC_VER < 1900
-int RS_vsnprintf(
+int vsnprintf_va_copy(
     char *buffer,
     size_t count,
     const char *format,
@@ -31,7 +31,7 @@ int RS_vsnprintf(
   return result;
 }
 #else
-int RS_vsnprintf(
+int vsnprintf_va_copy(
     char *buffer,
     size_t count,
     const char *format,
@@ -47,7 +47,7 @@ int RS_vsnprintf(
 }
 #endif
 
-void RS_va_end(va_list args)
+void vsnprintf_va_end(va_list args)
 {
   va_end(args);
 }

wrapper.h

@@ -22,11 +22,13 @@ extern const void *const RS_EMPTY_ARRAY_SENTINEL;
 // such as Microsoft Windows.
 //
 // Other than the standard `vsnprintf()`, this implementation copies the `va_list`
-// argument before passing it along to allow repeated calls.
-int RS_vsnprintf(
+// argument before passing it along to allow repeated calls. The caller is responsible
+// to invoke `vsnprintf_va_end()` on the `va_list` argument eventually.
+int vsnprintf_va_copy(
     char *buffer,
     size_t count,
     const char *format,
     va_list args);
 
-void RS_va_end(va_list args);
+// Wrapper for `va_end()` that is supposed to be used with `vsnprintf_va_copy()`.
+void vsnprintf_va_end(va_list args);