Signed-off-by: Laine Stump
---
src/conf/capabilities.c | 8 +++-
src/conf/checkpoint_conf.c | 2 +-
src/conf/cpu_conf.c | 9 +++--
src/conf/domain_addr.c | 2 +-
src/conf/domain_capabilities.c | 2 +-
src/conf/domain_conf.c | 12 ++--
src/conf/interface_conf.c| 7 +++
src/conf/network_conf.c | 3 +--
src/conf/node_device_conf.c | 2 +-
src/conf/nwfilter_conf.c | 7 +++
src/conf/secret_conf.c | 3 +--
src/conf/snapshot_conf.c | 2 +-
src/conf/storage_capabilities.c | 6 ++
src/conf/storage_conf.c | 11 ---
src/conf/virnetworkobj.c | 3 +--
src/conf/virnetworkportdef.c | 6 ++
src/conf/virnwfilterbindingdef.c | 6 ++
src/conf/virnwfilterbindingobj.c | 6 ++
src/conf/virsavecookie.c | 3 +--
19 files changed, 39 insertions(+), 61 deletions(-)
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 99b69aebb5..6a48af1fca 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -705,7 +705,7 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps,
/* XXX check default_emulator, see how it uses this */
if (!foundguest) {
-virBuffer buf = VIR_BUFFER_INITIALIZER;
+g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
if (ostype)
virBufferAsprintf(, "ostype=%s ",
virDomainOSTypeToString(ostype));
@@ -725,7 +725,6 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps,
virReportError(VIR_ERR_INVALID_ARG,
_("could not find capabilities for %s"),
virBufferCurrentContent());
-virBufferFreeAndReset();
return ret;
}
@@ -901,7 +900,7 @@ virCapabilitiesFormatResctrlMonitor(virBufferPtr buf,
virResctrlInfoMonPtr monitor)
{
size_t i = 0;
-virBuffer childrenBuf = VIR_BUFFER_INIT_CHILD(buf);
+g_auto(virBuffer) childrenBuf = VIR_BUFFER_INIT_CHILD(buf);
/* monitor not supported, no capability */
if (!monitor)
@@ -1335,7 +1334,7 @@ virCapabilitiesFormatStoragePoolXML(virCapsStoragePoolPtr
*pools,
char *
virCapabilitiesFormatXML(virCapsPtr caps)
{
-virBuffer buf = VIR_BUFFER_INITIALIZER;
+g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virBufferAddLit(, "\n\n");
virBufferAdjustIndent(, 2);
@@ -1353,7 +1352,6 @@ virCapabilitiesFormatXML(virCapsPtr caps)
return virBufferContentAndReset();
error:
-virBufferFreeAndReset();
return NULL;
}
diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c
index d557fada49..e0dce9c2ed 100644
--- a/src/conf/checkpoint_conf.c
+++ b/src/conf/checkpoint_conf.c
@@ -502,7 +502,7 @@ virDomainCheckpointDefFormat(virDomainCheckpointDefPtr def,
virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
-virBuffer buf = VIR_BUFFER_INITIALIZER;
+g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virCheckFlags(VIR_DOMAIN_CHECKPOINT_FORMAT_SECURE |
VIR_DOMAIN_CHECKPOINT_FORMAT_NO_DOMAIN |
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index e1b0a5653f..dd3db00bc8 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -668,7 +668,7 @@ char *
virCPUDefFormat(virCPUDefPtr def,
virDomainNumaPtr numa)
{
-virBuffer buf = VIR_BUFFER_INITIALIZER;
+g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
if (virCPUDefFormatBufFull(, def, numa) < 0)
goto cleanup;
@@ -676,7 +676,6 @@ virCPUDefFormat(virCPUDefPtr def,
return virBufferContentAndReset();
cleanup:
-virBufferFreeAndReset();
return NULL;
}
@@ -687,8 +686,8 @@ virCPUDefFormatBufFull(virBufferPtr buf,
virDomainNumaPtr numa)
{
int ret = -1;
-virBuffer attributeBuf = VIR_BUFFER_INITIALIZER;
-virBuffer childrenBuf = VIR_BUFFER_INIT_CHILD(buf);
+g_auto(virBuffer) attributeBuf = VIR_BUFFER_INITIALIZER;
+g_auto(virBuffer) childrenBuf = VIR_BUFFER_INIT_CHILD(buf);
if (!def)
return 0;
@@ -755,8 +754,6 @@ virCPUDefFormatBufFull(virBufferPtr buf,
ret = 0;
cleanup:
-virBufferFreeAndReset();
-virBufferFreeAndReset();
return ret;
}
diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index 2f9ff899d7..1068cbf1d2 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -1941,7 +1941,7 @@ virDomainUSBAddressPortFormatBuf(virBufferPtr buf,
static char * ATTRIBUTE_NONNULL(1)
virDomainUSBAddressPortFormat(unsigned int *port)
{
-virBuffer buf = VIR_BUFFER_INITIALIZER;
+g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virDomainUSBAddressPortFormatBuf(, port);
return virBufferContentAndReset();
}
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 0fa8aee78e..837b004334 100644
---
