[PATCH 1/3] virDomainBackupDefAssignStore: Restructure control flow

Peter Krempa posted 3 patches 1 year, 2 months ago
[PATCH 1/3] virDomainBackupDefAssignStore: Restructure control flow
Posted by Peter Krempa 1 year, 2 months ago
Return early for errors instead of using 'else' branches.

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

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;
-- 
2.40.1