From f5bc8796f75be01d39fad5d9769e3127e4463615 Mon Sep 17 00:00:00 2001
From: Patrick Pelissier <patrick.pelissier@gmail.com>
Date: Tue, 15 Dec 2020 22:14:43 +0100
Subject: [PATCH] Add functions: * string_vprintf * string_init_vprintf

---
 README.md  | 16 ++++++++++++++--
 m-string.h | 27 +++++++++++++++++++++------
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 37b1a615..1a1c2b92 100644
--- a/README.md
+++ b/README.md
@@ -5133,13 +5133,25 @@ It assumes that pos+len is before the end of the string of 'v'.
 
 ##### void string\_init\_printf(string\_t v, const char format[], ...)
 
-Initialize 'v' to the formatted string 'format'.
+Initialize 'v' to the formatted string 'format' with the given variable argument lists.
+'format' is like the printf function family.
+
+##### void string\_init\_vprintf(string\_t v, const char format[], va\_list args)
+
+Initialize 'v' to the formatted string 'format' with the given variable argument lists 'args'.
 'format' is like the printf function family.
 
 ##### int string\_printf (string\_t v, const char format[], ...)
 
 Set the string 'v' to the formatted string 'format'.
-'format' is like the printf function family.
+'format' is like the printf function family with the given variable argument list.
+Return the number of characters printed (excluding the final null char), or a negative value in case of error.
+
+##### int string\_vprintf (string\_t v, const char format[], va\_list args)
+
+Set the string 'v' to the formatted string 'format'.
+'format' is like the vprintf function family with the variable argument list 'args'.
+Return the number of characters printed (excluding the final null char), or a negative value in case of error.
 
 ##### int string\_cat\_printf (string\_t v, const char format[], ...)
 
diff --git a/m-string.h b/m-string.h
index 72ee5403..88843abe 100644
--- a/m-string.h
+++ b/m-string.h
@@ -910,23 +910,22 @@ string_replace_all (string_t v, const string_t str1, const string_t str2)
 
 /* Format in the string the given printf format */
 static inline int
-string_printf (string_t v, const char format[], ...)
+string_vprintf (string_t v, const char format[], va_list args)
 {
   STRINGI_CONTRACT (v);
   M_ASSERT (format != NULL);
-  va_list args;
   int size;
+  va_list args_org;
+  va_copy(args_org, args);
   char *ptr = stringi_get_cstr(v);
   size_t alloc = string_capacity(v);
-  va_start (args, format);
   size = vsnprintf (ptr, alloc, format, args);
   if (size > 0 && ((size_t) size+1 >= alloc) ) {
     // We have to realloc our string to fit the needed size
     ptr = stringi_fit2size (v, (size_t) size + 1);
     alloc = string_capacity(v);
     // and redo the parsing.
-    va_end (args);
-    va_start (args, format);
+    va_copy(args, args_org);
     size = vsnprintf (ptr, alloc, format, args);
     M_ASSERT (size > 0 && (size_t)size < alloc);
   }
@@ -937,11 +936,23 @@ string_printf (string_t v, const char format[], ...)
     stringi_set_size(v, 0);
     ptr[0] = 0;
   }
-  va_end (args);
   STRINGI_CONTRACT (v);
   return size;
 }
 
+/* Format in the string the given printf format */
+static inline int
+string_printf (string_t v, const char format[], ...)
+{
+  STRINGI_CONTRACT (v);
+  M_ASSERT (format != NULL);
+  va_list args;
+  va_start (args, format);
+  int ret = string_vprintf(v, format, args);
+  va_end (args);
+  return ret;
+}
+
 /* Append to the string the formatted string of the given printf format */
 static inline int
 string_cat_printf (string_t v, const char format[], ...)
@@ -1744,6 +1755,10 @@ namespace m_string {
 #define string_init_printf(v, ...)                                            \
   (string_init (v),  string_printf (v, __VA_ARGS__) ) 
 
+/* Initialize and set a string to the given formatted value. */
+#define string_init_vprintf(v, format, args)                                  \
+  (string_init (v),  string_vprintf (v, format, args) ) 
+
 /* Initialize a string with the given list of arguments.
    Check if it is a formatted input or not by counting the number of arguments.
    If there is only one argument, it can only be a set to C string.