From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 15 May 2023 10:17:06 +0000 (+0200)
Subject: virDomainBackupDefAssignStore: Restructure control flow
X-Git-Tag: v9.4.0-rc1~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de48ade19586fda704d4f517ffb219960c3d6a08;p=thirdparty%2Flibvirt.git

virDomainBackupDefAssignStore: Restructure control flow

Return early for errors instead of using 'else' branches.

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

diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c
index 4a8c05dca9..013c08cd6e 100644
--- a/src/conf/backup_conf.c
+++ b/src/conf/backup_conf.c
@@ -422,17 +422,19 @@ virDomainBackupDefAssignStore(virDomainBackupDiskDef *disk,
                            _("disk '%1$s' has no media"), disk->name);
             return -1;
         }
-    } else if (!disk->store) {
-        if (virStorageSourceGetActualType(src) == VIR_STORAGE_TYPE_FILE) {
-            disk->store = virStorageSourceNew();
-            disk->store->type = VIR_STORAGE_TYPE_FILE;
-            disk->store->path = g_strdup_printf("%s.%s", src->path, suffix);
-        } else {
+    }
+
+    if (!disk->store) {
+        if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_FILE) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("refusing to generate file name for disk '%1$s'"),
                            disk->name);
             return -1;
         }
+
+        disk->store = virStorageSourceNew();
+        disk->store->type = VIR_STORAGE_TYPE_FILE;
+        disk->store->path = g_strdup_printf("%s.%s", src->path, suffix);
     }
 
     return 0;