util: use g_vsnprintf

Instead of vsnprintf from gnulib, use g_vsnprintf from GLib.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index 1c46928ac75e9800b8c0fe8275a4b68ca080b782..74d0d5f6d48221a05a4b8257b014ddaf99754013 100644 (file)
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -445,6 +445,12 @@ sc_prohibit_asprintf:
        halt='use g_strdup instead of g_strdup_printf with "%s"' \
          $(_sc_search_regexp)
 
+sc_prohobit_vsnprintf:
+       @prohibit='\<vsnprintf\>' \
+       in_vc_files='\.[chx]$$' \
+       halt='use g_vsnprintf, not vsnprintf' \
+         $(_sc_search_regexp)
+
 sc_prohibit_strdup:
        @prohibit='\<strn?dup\> *\(' \
        halt='use VIR_STRDUP, not strdup' \

diff --git a/src/util/virerror.c b/src/util/virerror.c
index 54cd5b64b9616c39f94771b27c4d0047a27a6163..bf79a8aec7322df99bdc4a8eed55732c90fbde13 100644 (file)
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -1288,7 +1288,7 @@ void virReportErrorHelper(int domcode,
 
     if (fmt) {
         va_start(args, fmt);
-        vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args);
+        g_vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args);
         va_end(args);
     } else {
         errorMessage[0] = '\0';
@@ -1358,7 +1358,7 @@ void virReportSystemErrorFull(int domcode,
         int n;
 
         va_start(args, fmt);
-        n = vsnprintf(msgDetailBuf, sizeof(msgDetailBuf), fmt, args);
+        n = g_vsnprintf(msgDetailBuf, sizeof(msgDetailBuf), fmt, args);
         va_end(args);
 
         size_t len = strlen(errnoDetail);

diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index 4ad2ed455f020bee0014ad1a5cf5cd2e126ae101..603fcf213a3334273ee5fa075461847f0f4bea64 100644 (file)
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -764,7 +764,7 @@ virTypedParamSetNameVPrintf(virTypedParameterPtr par,
                             const char *fmt,
                             va_list ap)
 {
-    if (vsnprintf(par->field, VIR_TYPED_PARAM_FIELD_LENGTH, fmt, ap) > VIR_TYPED_PARAM_FIELD_LENGTH) {
+    if (g_vsnprintf(par->field, VIR_TYPED_PARAM_FIELD_LENGTH, fmt, ap) > VIR_TYPED_PARAM_FIELD_LENGTH) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field name too long"));
         return -1;
     }