]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: blockjob: Use VIR_AUTOUNREF in qemuBlockJobDataNew
authorPeter Krempa <pkrempa@redhat.com>
Wed, 26 Jun 2019 12:50:25 +0000 (14:50 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 18 Jul 2019 15:59:34 +0000 (17:59 +0200)
Simplify error paths.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_blockjob.c

index b3bdbeb99065ba445bd1f66584ac8165b484b0ce..b45103f2f348f537b56c603a00f1de54159609b5 100644 (file)
@@ -73,8 +73,7 @@ static qemuBlockJobDataPtr
 qemuBlockJobDataNew(qemuBlockJobType type,
                     const char *name)
 {
-    qemuBlockJobDataPtr job = NULL;
-    qemuBlockJobDataPtr ret = NULL;
+    VIR_AUTOUNREF(qemuBlockJobDataPtr) job = NULL;
 
     if (qemuBlockJobDataInitialize() < 0)
         return NULL;
@@ -83,17 +82,13 @@ qemuBlockJobDataNew(qemuBlockJobType type,
         return NULL;
 
     if (VIR_STRDUP(job->name, name) < 0)
-        goto cleanup;
+        return NULL;
 
     job->state = QEMU_BLOCKJOB_STATE_NEW;
     job->newstate = -1;
     job->type = type;
 
-    VIR_STEAL_PTR(ret, job);
-
- cleanup:
-    virObjectUnref(job);
-    return ret;
+    VIR_RETURN_PTR(job);
 }