From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 9 Oct 2013 15:39:14 +0000 (+0200)
Subject: qemu: Fix coding style in qemuDomainSaveFlags()
X-Git-Tag: CVE-2013-4401~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2b0a5336ebb899d38bf5ac3f60359715b3ab9eb;p=thirdparty%2Flibvirt.git

qemu: Fix coding style in qemuDomainSaveFlags()

Avoid mixed brace style in an if statement and fix formatting of error
messages.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c71aeccb22..b9f340cc6d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3158,7 +3158,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml,
                     unsigned int flags)
 {
     virQEMUDriverPtr driver = dom->conn->privateData;
-    int compressed;
+    int compressed = QEMU_SAVE_FORMAT_RAW;
     int ret = -1;
     virDomainObjPtr vm = NULL;
     virQEMUDriverConfigPtr cfg = NULL;
@@ -3168,20 +3168,18 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml,
                   VIR_DOMAIN_SAVE_PAUSED, -1);
 
     cfg = virQEMUDriverGetConfig(driver);
-    if (cfg->saveImageFormat == NULL)
-        compressed = QEMU_SAVE_FORMAT_RAW;
-    else {
+    if (cfg->saveImageFormat) {
         compressed = qemuSaveCompressionTypeFromString(cfg->saveImageFormat);
         if (compressed < 0) {
-            virReportError(VIR_ERR_OPERATION_FAILED,
-                           "%s", _("Invalid save image format specified "
-                                   "in configuration file"));
+            virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                           _("Invalid save image format specified "
+                             "in configuration file"));
             goto cleanup;
         }
         if (!qemuCompressProgramAvailable(compressed)) {
-            virReportError(VIR_ERR_OPERATION_FAILED,
-                           "%s", _("Compression program for image format "
-                                   "in configuration file isn't available"));
+            virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                           _("Compression program for image format "
+                             "in configuration file isn't available"));
             goto cleanup;
         }
     }