remove redundant calls to virBufferFreeAndReset()

There are several calls to virBufferFreeAndReset() when functions
encounter an error, but the caller never uses the virBuffer once an
error has been encountered (all callers detect error by looking at the
function return value, not the contents of the virBuffer being
operated on), and now that all virBuffers are auto-freed there is no
reason for the lower level functions like these to spend time freeing
a buffer that is guaranteed to be freed momentarily anyway.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c
index 89d117043b3b7eb1a4d53b18228df66e7409dace..851c84f9838d6d4d1eab30a6689342eef40ed4fd 100644 (file)
--- a/src/conf/checkpoint_conf.c
+++ b/src/conf/checkpoint_conf.c
@@ -493,7 +493,6 @@ virDomainCheckpointDefFormatInternal(virBufferPtr buf,
     return 0;
 
  error:
-    virBufferFreeAndReset(buf);
     return -1;
 }
 

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3a110b330f1e1a2b569454720042f20db89d7480..d33eb65f05ca0484d920c6bb526c886bf793c568 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -29970,7 +29970,6 @@ virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
     return 0;
 
  error:
-    virBufferFreeAndReset(buf);
     return -1;
 }
 

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 9767592bfc9ca79ad29f772bea10a99be777a056..b7ed3b42df1ce36b3e5aaeebc6d73b4203f4a3dd 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -916,7 +916,6 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf,
     return 0;
 
  error:
-    virBufferFreeAndReset(buf);
     return -1;
 }
 

diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index f4d6a631d11ce777534c226f59de8c051c4c98a2..a4b6bc3c9b940319cefd575f0e6556c159fae7ab 100644 (file)
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -1432,7 +1432,6 @@ xenFormatXLVnode(virConfValuePtr list,
     ret = 0;
 
  cleanup:
-    virBufferFreeAndReset(buf);
     return ret;
 }
 

diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index dbca99c1ef42129ac233fbb21773b916c9272901..e69fc51a1e2349112070a6422cba598332bae153 100644 (file)
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -1581,7 +1581,6 @@ virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def)
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unexpected sysinfo type model %d"),
                        def->type);
-        virBufferFreeAndReset(buf);
         return -1;
     }
 

diff --git a/src/util/virxml.c b/src/util/virxml.c
index 1eaf390db28e7db9d0c89ef3c6469682dd9c13ad..78001363df043fd3270d10cd479a9b518f12b217 100644 (file)
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -1284,7 +1284,6 @@ virXMLValidatorValidate(virXMLValidatorPtr validator,
 
     ret = 0;
  cleanup:
-    virBufferFreeAndReset(&validator->buf);
     return ret;
 }