[libvirt] [PATCH 70/75] Rename virVasprintfQuiet() to virVasprintf()

Michal Privoznik mprivozn at redhat.com
Tue Oct 22 13:58:14 UTC 2019


There's no difference between virVasprintf() and
virVasprintfQuiet(). Fix places where the latter
is used to use the former.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/util/virerror.c | 4 ++--
 src/util/virlog.c   | 2 +-
 tests/eventtest.c   | 2 +-
 tools/vsh.c         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/util/virerror.c b/src/util/virerror.c
index 76a75e27a8..5403caf025 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -830,7 +830,7 @@ virRaiseErrorFull(const char *filename,
     } else {
         va_list ap;
         va_start(ap, fmt);
-        ignore_value(virVasprintfQuiet(&str, fmt, ap));
+        ignore_value(virVasprintf(&str, fmt, ap));
         va_end(ap);
     }
 
@@ -1485,7 +1485,7 @@ virLastErrorPrefixMessage(const char *fmt, ...)
 
     va_start(args, fmt);
 
-    if (virVasprintfQuiet(&fmtmsg, fmt, args) < 0)
+    if (virVasprintf(&fmtmsg, fmt, args) < 0)
         goto cleanup;
 
     newmsg = g_strdup_printf("%s: %s", fmtmsg, err->message);
diff --git a/src/util/virlog.c b/src/util/virlog.c
index e7d62e3948..f7ae47559f 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -594,7 +594,7 @@ virLogVMessage(virLogSourcePtr source,
     /*
      * serialize the error message, add level and timestamp
      */
-    if (virVasprintfQuiet(&str, fmt, vargs) < 0)
+    if (virVasprintf(&str, fmt, vargs) < 0)
         goto cleanup;
 
     virLogFormatString(&msg, linenr, funcname, priority, str);
diff --git a/tests/eventtest.c b/tests/eventtest.c
index 363fc776fd..74b2a807f3 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -89,7 +89,7 @@ testEventReport(const char *name, bool failed, const char *msg, ...)
     char *str = NULL;
     struct testEventResultData data;
 
-    if (msg && virVasprintfQuiet(&str, msg, vargs) != 0)
+    if (msg && virVasprintf(&str, msg, vargs) != 0)
         failed = true;
 
     data.failed = failed;
diff --git a/tools/vsh.c b/tools/vsh.c
index 7002aa635e..7af3ce237c 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -1875,7 +1875,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ...)
         return;
 
     va_start(ap, format);
-    if (virVasprintfQuiet(&str, format, ap) < 0)
+    if (virVasprintf(&str, format, ap) < 0)
         vshErrorOOM();
     va_end(ap);
     fputs(str, stdout);
@@ -1890,7 +1890,7 @@ vshPrint(vshControl *ctl G_GNUC_UNUSED, const char *format, ...)
     char *str;
 
     va_start(ap, format);
-    if (virVasprintfQuiet(&str, format, ap) < 0)
+    if (virVasprintf(&str, format, ap) < 0)
         vshErrorOOM();
     va_end(ap);
     fputs(str, stdout);
-- 
2.21.0




More information about the libvir-list mailing list