From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 16 May 2013 06:24:56 +0000 (+0200)
Subject: conf: split out snapshot disk XML formatting
X-Git-Tag: v1.1.0-rc1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75c787326d8fa1be0e2bf9efefe7eff32507696d;p=thirdparty%2Flibvirt.git

conf: split out snapshot disk XML formatting

Just to reduce the indentation levels. Remove the unneeded
NULL check for disk->file, as virBufferEscapeString doesn't
print anything with NULL arguments.
---

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index c6b97d69a1..b50011184f 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -548,6 +548,33 @@ cleanup:
     return ret;
 }
 
+static void
+virDomainSnapshotDiskDefFormat(virBufferPtr buf,
+                               virDomainSnapshotDiskDefPtr disk)
+{
+    if (!disk->name)
+        return;
+
+    virBufferEscapeString(buf, "    <disk name='%s'", disk->name);
+    if (disk->snapshot > 0)
+        virBufferAsprintf(buf, " snapshot='%s'",
+                          virDomainSnapshotLocationTypeToString(disk->snapshot));
+    if (!disk->file && disk->format == 0) {
+        virBufferAddLit(buf, "/>\n");
+        return;
+    }
+
+    virBufferAddLit(buf, ">\n");
+
+    virBufferAdjustIndent(buf, 6);
+    if (disk->format > 0)
+        virBufferEscapeString(buf, "<driver type='%s'/>\n",
+                              virStorageFileFormatTypeToString(disk->format));
+    virBufferEscapeString(buf, "<source file='%s'/>\n", disk->file);
+    virBufferAdjustIndent(buf, -6);
+    virBufferAddLit(buf, "    </disk>\n");
+}
+
 char *virDomainSnapshotDefFormat(const char *domain_uuid,
                                  virDomainSnapshotDefPtr def,
                                  unsigned int flags,
@@ -583,30 +610,8 @@ char *virDomainSnapshotDefFormat(const char *domain_uuid,
     }
     if (def->ndisks) {
         virBufferAddLit(&buf, "  <disks>\n");
-        for (i = 0; i < def->ndisks; i++) {
-            virDomainSnapshotDiskDefPtr disk = &def->disks[i];
-
-            if (!disk->name)
-                continue;
-
-            virBufferEscapeString(&buf, "    <disk name='%s'", disk->name);
-            if (disk->snapshot)
-                virBufferAsprintf(&buf, " snapshot='%s'",
-                                  virDomainSnapshotLocationTypeToString(disk->snapshot));
-            if (disk->file || disk->format > 0) {
-                virBufferAddLit(&buf, ">\n");
-                if (disk->format > 0)
-                    virBufferEscapeString(&buf, "      <driver type='%s'/>\n",
-                                          virStorageFileFormatTypeToString(
-                                              disk->format));
-                if (disk->file)
-                    virBufferEscapeString(&buf, "      <source file='%s'/>\n",
-                                          disk->file);
-                virBufferAddLit(&buf, "    </disk>\n");
-            } else {
-                virBufferAddLit(&buf, "/>\n");
-            }
-        }
+        for (i = 0; i < def->ndisks; i++)
+            virDomainSnapshotDiskDefFormat(&buf, &def->disks[i]);
         virBufferAddLit(&buf, "  </disks>\n");
     }
     if (def->dom) {