From 96fbf6df90335c1f9315fc25162711fd632d4dab Mon Sep 17 00:00:00 2001
From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Date: Tue, 24 Jul 2018 21:22:04 +0530
Subject: [PATCH] util: buffer: define cleanup function using
 VIR_DEFINE_AUTOPTR_FUNC

Using the new VIR_DEFINE_AUTOPTR_FUNC macro defined in
src/util/viralloc.h, define a new wrapper around an existing
cleanup function which will be called when a variable declared
with VIR_AUTOPTR macro goes out of scope. Also, drop the redundant
viralloc.h include, since that has moved from the source module into
the header.

When variables of type virBufferPtr and virBufferEscapePairPtr
are declared using VIR_AUTOPTR, the functions virBufferFreeAndReset
and virBufferEscapePairFree, respectively, will be run automatically
on them when they go out of scope.

Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---
 src/util/virbuffer.c | 17 +++++++++++++++--
 src/util/virbuffer.h |  6 +++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index ea967045e7..86bc17957f 100644
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -31,10 +31,10 @@
 #define __VIR_BUFFER_C__
 
 #include "virbuffer.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "virstring.h"
 
+#define VIR_FROM_THIS VIR_FROM_NONE
 
 /* If adding more fields, ensure to edit buf.h to match
    the number of fields */
@@ -656,6 +656,19 @@ struct _virBufferEscapePair {
     char *toescape;
 };
 
+static void
+virBufferEscapePairFree(virBufferEscapePairPtr pair)
+{
+    if (!pair)
+        return;
+
+    VIR_FREE(pair->toescape);
+    VIR_FREE(pair);
+}
+
+VIR_DEFINE_AUTOPTR_FUNC(virBufferEscapePair, virBufferEscapePairFree)
+
+
 /**
  * virBufferEscapeN:
  * @buf: the buffer to append to
@@ -696,7 +709,7 @@ virBufferEscapeN(virBufferPtr buf,
     va_start(ap, str);
 
     while ((escapeItem.escape = va_arg(ap, int))) {
-        if (!(escapeItem.toescape = va_arg(ap, char *))) {
+        if (VIR_STRDUP(escapeItem.toescape, va_arg(ap, char *)) < 0) {
             virBufferSetError(buf, errno);
             goto cleanup;
         }
diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h
index e95ee878a1..c662e8ea72 100644
--- a/src/util/virbuffer.h
+++ b/src/util/virbuffer.h
@@ -23,9 +23,11 @@
 #ifndef __VIR_BUFFER_H__
 # define __VIR_BUFFER_H__
 
+# include <stdarg.h>
+
 # include "internal.h"
+# include "viralloc.h"
 
-# include <stdarg.h>
 
 /**
  * virBuffer:
@@ -119,4 +121,6 @@ int virBufferGetIndent(const virBuffer *buf, bool dynamic);
 void virBufferTrim(virBufferPtr buf, const char *trim, int len);
 void virBufferAddStr(virBufferPtr buf, const char *str);
 
+VIR_DEFINE_AUTOPTR_FUNC(virBuffer, virBufferFreeAndReset)
+
 #endif /* __VIR_BUFFER_H__ */
-- 
GitLab