From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Date: Tue, 24 Jul 2018 15:52:06 +0000 (+0530)
Subject: util: buffer: use VIR_AUTOPTR for aggregate types
X-Git-Tag: v4.6.0-rc1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0a92a037123085398d4123472f59c71b436d485;p=thirdparty%2Flibvirt.git

util: buffer: use VIR_AUTOPTR for aggregate types

By making use of GNU C's cleanup attribute handled by the
VIR_AUTOPTR macro for declaring aggregate pointer variables,
majority of the calls to *Free functions can be dropped, which
in turn leads to getting rid of most of our cleanup sections.

Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index 2d7bd5152e..2cf82260a9 100644
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -694,7 +694,7 @@ virBufferEscapeN(virBufferPtr buf,
     char *out;
     const char *cur;
     virBufferEscapePair escapeItem;
-    virBufferEscapePairPtr escapeList = NULL;
+    VIR_AUTOPTR(virBufferEscapePair) escapeList = NULL;
     size_t nescapeList = 0;
     va_list ap;
 
@@ -752,7 +752,6 @@ virBufferEscapeN(virBufferPtr buf,
 
  cleanup:
     va_end(ap);
-    VIR_FREE(escapeList);
 }