From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 2 Jul 2013 16:27:09 +0000 (+0200)
Subject: selinux: Cleanup coding style
X-Git-Tag: CVE-2013-2230~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e45ee23c5903e83d912f7278d7637ef69b721dc8;p=thirdparty%2Flibvirt.git

selinux: Cleanup coding style
---

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 7802ddaa25..ec4f764e4a 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -589,23 +589,22 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr,
     int catMin, catMax;
 
     seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME);
-    if (seclabel == NULL) {
+    if (seclabel == NULL)
         return rc;
-    }
 
     data = virSecurityManagerGetPrivateData(mgr);
 
     VIR_DEBUG("label=%s", virSecurityManagerGetDriver(mgr));
     if (seclabel->type == VIR_DOMAIN_SECLABEL_DYNAMIC &&
         seclabel->label) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       "%s", _("security label already defined for VM"));
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("security label already defined for VM"));
         return rc;
     }
 
     if (seclabel->imagelabel) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       "%s", _("security image label already defined for VM"));
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("security image label already defined for VM"));
         return rc;
     }
 
@@ -628,8 +627,7 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr,
             return rc;
         }
 
-        range = context_range_get(ctx);
-        if (!range) {
+        if (!(range = context_range_get(ctx))) {
             virReportOOMError();
             goto cleanup;
         }