[libvirt] [PATCH] util: Use virStorageSourceNew in virStorageFileMetadataNew

Peter Krempa pkrempa at redhat.com
Mon Feb 18 12:27:30 UTC 2019


Commit dcda2bf4c110 forgot to fix this one instance.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/util/virstoragefile.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 5927140a66..b2e308d81d 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1119,22 +1119,20 @@ static virStorageSourcePtr
 virStorageFileMetadataNew(const char *path,
                           int format)
 {
-    virStorageSourcePtr def = NULL;
+    VIR_AUTOUNREF(virStorageSourcePtr) def = NULL;
+    virStorageSourcePtr ret = NULL;

-    if (VIR_ALLOC(def) < 0)
+    if (!(def = virStorageSourceNew()))
         return NULL;

     def->format = format;
     def->type = VIR_STORAGE_TYPE_FILE;

     if (VIR_STRDUP(def->path, path) < 0)
-        goto error;
-
-    return def;
+        return NULL;

- error:
-    virObjectUnref(def);
-    return NULL;
+    VIR_STEAL_PTR(ret, def);
+    return ret;
 }


-- 
2.20.1




More information about the libvir-list mailing list