From: Harry Wei <harryxiyou@gmail.com>
Date: Mon, 22 Apr 2013 12:33:46 +0000 (+0800)
Subject: sheepdog: Omit braces with a single-line body
X-Git-Tag: v1.0.5-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f35e00135cb7c02c6b186493b7ec0e50052e324;p=thirdparty%2Flibvirt.git

sheepdog: Omit braces with a single-line body

libvirt/HACKING suggests omitting braces with a
single-line body; this patch fixes the coding style
problem for the Sheepdog storage backend driver.

Signed-off-by: Harry Wei <harryxiyou@gmail.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c
index 35a3a04940..15fa29c7e2 100644
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -97,12 +97,10 @@ virStorageBackendSheepdogAddHostArg(virCommandPtr cmd,
     const char *address = "localhost";
     int port = 7000;
     if (pool->def->source.nhost > 0) {
-        if (pool->def->source.hosts[0].name != NULL) {
+        if (pool->def->source.hosts[0].name != NULL)
             address = pool->def->source.hosts[0].name;
-        }
-        if (pool->def->source.hosts[0].port) {
+        if (pool->def->source.hosts[0].port)
             port = pool->def->source.hosts[0].port;
-        }
     }
     virCommandAddArg(cmd, "-a");
     virCommandAddArgFormat(cmd, "%s", address);
@@ -210,11 +208,10 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol,
             continue;
 
         /* skip space */
-        if (p + 2 < next) {
+        if (p + 2 < next)
             p += 2;
-        } else {
+        else
             return -1;
-        }
 
         /* skip name */
         while (*p != '\0' && *p != ' ') {