Eliminate two more gnulib modules (glib chronicles)

[libvirt] [PATCH 1/2] util: use g_vsnprintf

Posted by Ján Tomko 6 years, 2 months ago

Instead of vsnprintf from gnulib, use g_vsnprintf from GLib.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 src/util/virerror.c      | 4 ++--
 src/util/virtypedparam.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/util/virerror.c b/src/util/virerror.c
index 54cd5b64b9..bf79a8aec7 100644
--- 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 4ad2ed455f..603fcf213a 100644
--- 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;
     }
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 1/2] util: use g_vsnprintf

Posted by Peter Krempa 6 years, 2 months ago

On Wed, Nov 13, 2019 at 10:33:08 +0100, Ján Tomko wrote:
> Instead of vsnprintf from gnulib, use g_vsnprintf from GLib.
> 
> Signed-off-by: Ján Tomko <jtomko@redhat.com>
> ---
>  src/util/virerror.c      | 4 ++--
>  src/util/virtypedparam.c | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

I think you should add a syntax-check rule forbidding use of plain
vsnprintf.

With that:

Reviewed-by: Peter Krempa <pkrempa@redhat.com>

I queued the appropriate patch to bootstrap.conf to my branch of the
kill-a-gnulib-module-a-day initiative.

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 1/2] util: use g_vsnprintf

Posted by Daniel P. Berrangé 6 years, 2 months ago

On Wed, Nov 13, 2019 at 10:33:08AM +0100, Ján Tomko wrote:
> Instead of vsnprintf from gnulib, use g_vsnprintf from GLib.
> 
> Signed-off-by: Ján Tomko <jtomko@redhat.com>
> ---
>  src/util/virerror.c      | 4 ++--
>  src/util/virtypedparam.c | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

The change to bootsrap.conf is missing to remove vsnprintf.

With that added

  Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list