Drop virAsprintf()

Now that function is no longer used, it can be dropped.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index 427f12fd245257637b4d396423b67d208de0b144..1c46928ac75e9800b8c0fe8275a4b68ca080b782 100644 (file)
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -435,14 +435,14 @@ sc_prohibit_strtol:
        halt='use virStrToDouble, not strtod variants' \
          $(_sc_search_regexp)
 
-# Use virAsprintf rather than as'printf since *strp is undefined on error.
-# But for plain %s, virAsprintf is overkill compared to strdup.
+# Use g_strdup_printf rather than as'printf since *strp is undefined on error.
+# But for plain %s, g_strdup_printf is overkill compared to g_strdup.
 sc_prohibit_asprintf:
        @prohibit='\<v?a[s]printf\>' \
-       halt='use virAsprintf, not asprintf' \
+       halt='use g_strdup_printf, not asprintf' \
          $(_sc_search_regexp)
-       @prohibit='virAsprintf.*, *"%s",' \
-       halt='use VIR_STRDUP instead of virAsprintf with "%s"' \
+       @prohibit='g_strdup_printf.*, *"%s",' \
+       halt='use g_strdup instead of g_strdup_printf with "%s"' \
          $(_sc_search_regexp)
 
 sc_prohibit_strdup:

diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
index 1318ca59b9a03744978def3676d26d5520eadb9b..be5dc3de514fc866ff85f51cab90f724023e1d35 100644 (file)
--- a/m4/virt-compile-warnings.m4
+++ b/m4/virt-compile-warnings.m4
@@ -51,8 +51,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
     dontwarn="$dontwarn -Wstrict-overflow"
     # Not a problem since we don't use -funsafe-loop-optimizations
     dontwarn="$dontwarn -Wunsafe-loop-optimizations"
-    # Things like virAsprintf mean we can't use this
-    dontwarn="$dontwarn -Wformat-nonliteral"
     # Gnulib's stat-time.h violates this
     dontwarn="$dontwarn -Waggregate-return"
     # gcc 4.4.6 complains this is C++ only; gcc 4.7.0 implies this from -Wall

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 0a5431b50b853b53129a60d449ccf1573819da95..b013e4d6ef63f6c8f4b68820b74bf9e99ca7e5b8 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3069,7 +3069,6 @@ virStorageFileBackendRegister;
 
 
 # util/virstring.h
-virAsprintfInternal;
 virSkipSpaces;
 virSkipSpacesAndBackslash;
 virSkipSpacesBackwards;

diff --git a/src/util/virstring.c b/src/util/virstring.c
index dfdde30510f33a89db3d0dd97bd10d443a228ba7..040b3ac26b73076ed732c1c1c4db0f3eb896c0fa 100644 (file)
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -744,25 +744,6 @@ virVasprintfInternal(char **strp,
     return ret;
 }
 
-int
-virAsprintfInternal(char **strp,
-                    const char *fmt, ...)
-{
-    va_list ap;
-    char *str = NULL;
-    int ret;
-
-    va_start(ap, fmt);
-    ret = g_vasprintf(&str, fmt, ap);
-    va_end(ap);
-
-    if (!*str)
-        abort();
-    *strp = str;
-
-    return ret;
-}
-
 /**
  * virStrncpy:
  *

diff --git a/src/util/virstring.h b/src/util/virstring.h
index 0bebdc4492360490c0ac14bce2156124c52521bc..5de6dd3252c4901aea3d7bff3d8436de52d56a72 100644 (file)
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -133,9 +133,6 @@ 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 virAsprintfInternal(char **strp, const char *fmt, ...)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 3)
-    G_GNUC_WARN_UNUSED_RESULT;
 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;
@@ -229,18 +226,6 @@ size_t virStringListLength(const char * const *strings);
  */
 #define virVasprintfQuiet(strp, fmt, list) virVasprintf(strp, fmt, list)
 
-/**
- * virAsprintf:
- * @strp: variable to hold result (char **)
- * @fmt: printf format
- *
- * Like glibc's asprintf but aborts on OOM.
- *
- * Returns number of bytes printed on success, aborts on OOM
- */
-
-#define virAsprintf(strp, ...) virAsprintfInternal(strp, __VA_ARGS__)
-
 int virStringSortCompare(const void *a, const void *b);
 int virStringSortRevCompare(const void *a, const void *b);
 int virStringToUpper(char **dst, const char *src);