From 13af21fb7490e4aae1514ee1318c7096eea07fcc Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 13 Apr 2023 09:19:27 +0200
Subject: [PATCH] vshPrint: Add version using 'va_list'

Add a version for functions which may already need to take a printf
format string.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 tools/vsh.c | 36 ++++++++++++++++++++++++------------
 tools/vsh.h |  4 ++++
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/tools/vsh.c b/tools/vsh.c
index 5b672b8edf..41f55a91fa 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -1865,34 +1865,46 @@ vshDebug(vshControl *ctl, int level, const char *format, ...)
     fflush(stdout);
 }
 
+
 void
-vshPrintExtra(vshControl *ctl, const char *format, ...)
+vshPrintVa(vshControl *ctl G_GNUC_UNUSED,
+           const char *format,
+           va_list ap)
 {
-    va_list ap;
     g_autofree char *str = NULL;
 
-    if (ctl && ctl->quiet)
-        return;
-
-    va_start(ap, format);
     str = g_strdup_vprintf(format, ap);
-    va_end(ap);
     fputs(str, stdout);
     fflush(stdout);
 }
 
 
 void
-vshPrint(vshControl *ctl G_GNUC_UNUSED, const char *format, ...)
+vshPrintExtra(vshControl *ctl,
+              const char *format,
+              ...)
 {
     va_list ap;
-    g_autofree char *str = NULL;
+
+    if (ctl && ctl->quiet)
+        return;
 
     va_start(ap, format);
-    str = g_strdup_vprintf(format, ap);
+    vshPrintVa(ctl, format, ap);
+    va_end(ap);
+}
+
+
+void
+vshPrint(vshControl *ctl,
+         const char *format,
+         ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    vshPrintVa(ctl, format, ap);
     va_end(ap);
-    fputs(str, stdout);
-    fflush(stdout);
 }
 
 
diff --git a/tools/vsh.h b/tools/vsh.h
index 51f09cd2b0..377c5947c1 100644
--- a/tools/vsh.h
+++ b/tools/vsh.h
@@ -302,6 +302,10 @@ const vshCmdOpt *vshCommandOptArgv(vshControl *ctl, const vshCmd *cmd,
 bool vshCommandArgvParse(vshControl *ctl, int nargs, char **argv);
 int vshCommandOptTimeoutToMs(vshControl *ctl, const vshCmd *cmd, int *timeout);
 
+void vshPrintVa(vshControl *ctl,
+                const char *format,
+                va_list ap)
+    G_GNUC_PRINTF(2, 0);
 void vshPrint(vshControl *ctl, const char *format, ...)
     G_GNUC_PRINTF(2, 3);
 void vshPrintExtra(vshControl *ctl, const char *format, ...)