[libvirt] [PATCH 73/75] virstring: Make virVasprintf() return no value

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


Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/util/virstring.c | 7 ++-----
 src/util/virstring.h | 5 ++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/util/virstring.c b/src/util/virstring.c
index f6495fdb72..c704ce38f0 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -722,15 +722,14 @@ virDoubleToStr(char **strp, double number)
 }
 
 
-int
+void
 virVasprintfInternal(char **strp,
                      const char *fmt,
                      va_list list)
 {
     char *str = NULL;
-    int ret;
 
-    ret = g_vasprintf(&str, fmt, list);
+    g_vasprintf(&str, fmt, list);
 
     /* GLib is supposed to abort() on OOM, but a mistake meant
      * it did not. Delete this once our min glib is at 2.64.0
@@ -742,8 +741,6 @@ virVasprintfInternal(char **strp,
         abort();
 #endif
     *strp = str;
-
-    return ret;
 }
 
 /**
diff --git a/src/util/virstring.h b/src/util/virstring.h
index 6072af8f59..ea0774f2c7 100644
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -133,9 +133,8 @@ int virStrdup(char **dest, const char *src)
 
 int virStrndup(char **dest, const char *src, ssize_t n)
     G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1);
-int virVasprintfInternal(char **strp, const char *fmt, va_list list)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 0)
-    G_GNUC_WARN_UNUSED_RESULT;
+void virVasprintfInternal(char **strp, const char *fmt, va_list list)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 0);
 
 /**
  * VIR_STRDUP:
-- 
2.21.0




More information about the libvir-list mailing list