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: NSukrit Bhatnagar <skrtbhtngr@gmail.com>
Reviewed-by: NErik Skultety <eskultet@redhat.com>

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;
         }

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__ */