changing whitespace for fun and profit: policydb.c

More formatting changes.  Aside from the 80 character line limit even
the checkpatch scripts like this file now.  Too bad I don't get paid by
the lines of code I change.

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 63 insertions, 68 deletions

diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 891c2d07e8b6..84f8cc73c7db 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -11,7 +11,7 @@
  *
  * Updated: Frank Mayer <mayerf@tresys.com> and Karl MacMillan <kmacmillan@tresys.com>
  *
- *      Added conditional policy language extensions
+ *      Added conditional policy language extensions
  *
  * Updated: Hewlett-Packard <paul.moore@hp.com>
  *
@@ -21,7 +21,7 @@
  * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc.
  * Copyright (C) 2003 - 2004 Tresys Technology, LLC
  *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
+ *      it under the terms of the GNU General Public License as published by
  *      the Free Software Foundation, version 2.
  */
 
@@ -51,7 +51,7 @@ static char *symtab_name[SYM_NUM] = {
 };
 #endif
 
-int selinux_mls_enabled = 0;
+int selinux_mls_enabled;
 
 static unsigned int symtab_sizes[SYM_NUM] = {
         2,
@@ -73,39 +73,39 @@ struct policydb_compat_info {
 /* These need to be updated if SYM_NUM or OCON_NUM changes */
 static struct policydb_compat_info policydb_compat[] = {
         {
-                .version        = POLICYDB_VERSION_BASE,
-                .sym_num        = SYM_NUM - 3,
-                .ocon_num       = OCON_NUM - 1,
+                .version        = POLICYDB_VERSION_BASE,
+                .sym_num        = SYM_NUM - 3,
+                .ocon_num       = OCON_NUM - 1,
         },
         {
-                .version        = POLICYDB_VERSION_BOOL,
-                .sym_num        = SYM_NUM - 2,
-                .ocon_num       = OCON_NUM - 1,
+                .version        = POLICYDB_VERSION_BOOL,
+                .sym_num        = SYM_NUM - 2,
+                .ocon_num       = OCON_NUM - 1,
         },
         {
-                .version        = POLICYDB_VERSION_IPV6,
-                .sym_num        = SYM_NUM - 2,
-                .ocon_num       = OCON_NUM,
+                .version        = POLICYDB_VERSION_IPV6,
+                .sym_num        = SYM_NUM - 2,
+                .ocon_num       = OCON_NUM,
         },
         {
-                .version        = POLICYDB_VERSION_NLCLASS,
-                .sym_num        = SYM_NUM - 2,
-                .ocon_num       = OCON_NUM,
+                .version        = POLICYDB_VERSION_NLCLASS,
+                .sym_num        = SYM_NUM - 2,
+                .ocon_num       = OCON_NUM,
         },
         {
-                .version        = POLICYDB_VERSION_MLS,
-                .sym_num        = SYM_NUM,
-                .ocon_num       = OCON_NUM,
+                .version        = POLICYDB_VERSION_MLS,
+                .sym_num        = SYM_NUM,
+                .ocon_num       = OCON_NUM,
         },
         {
-                .version        = POLICYDB_VERSION_AVTAB,
-                .sym_num        = SYM_NUM,
-                .ocon_num       = OCON_NUM,
+                .version        = POLICYDB_VERSION_AVTAB,
+                .sym_num        = SYM_NUM,
+                .ocon_num       = OCON_NUM,
         },
         {
-                .version        = POLICYDB_VERSION_RANGETRANS,
-                .sym_num        = SYM_NUM,
-                .ocon_num       = OCON_NUM,
+                .version        = POLICYDB_VERSION_RANGETRANS,
+                .sym_num        = SYM_NUM,
+                .ocon_num       = OCON_NUM,
         },
         {
                 .version        = POLICYDB_VERSION_POLCAP,
@@ -152,7 +152,7 @@ static int roles_init(struct policydb *p)
                 rc = -EINVAL;
                 goto out_free_role;
         }
-        key = kmalloc(strlen(OBJECT_R)+1,GFP_KERNEL);
+        key = kmalloc(strlen(OBJECT_R)+1, GFP_KERNEL);
         if (!key) {
                 rc = -ENOMEM;
                 goto out_free_role;
@@ -424,7 +424,7 @@ static int policydb_index_others(struct policydb *p)
 
         p->role_val_to_struct =
                 kmalloc(p->p_roles.nprim * sizeof(*(p->role_val_to_struct)),
-                        GFP_KERNEL);
+                        GFP_KERNEL);
         if (!p->role_val_to_struct) {
                 rc = -ENOMEM;
                 goto out;
@@ -432,7 +432,7 @@ static int policydb_index_others(struct policydb *p)
 
         p->user_val_to_struct =
                 kmalloc(p->p_users.nprim * sizeof(*(p->user_val_to_struct)),
-                        GFP_KERNEL);
+                        GFP_KERNEL);
         if (!p->user_val_to_struct) {
                 rc = -ENOMEM;
                 goto out;
@@ -634,7 +634,7 @@ void policydb_destroy(struct policydb *p)
                 while (c) {
                         ctmp = c;
                         c = c->next;
-                        ocontext_destroy(ctmp,i);
+                        ocontext_destroy(ctmp, i);
                 }
                 p->ocontexts[i] = NULL;
         }
@@ -647,7 +647,7 @@ void policydb_destroy(struct policydb *p)
                 while (c) {
                         ctmp = c;
                         c = c->next;
-                        ocontext_destroy(ctmp,OCON_FSUSE);
+                        ocontext_destroy(ctmp, OCON_FSUSE);
                 }
                 gtmp = g;
                 g = g->next;
@@ -664,14 +664,14 @@ void policydb_destroy(struct policydb *p)
         }
         kfree(ltr);
 
-        for (ra = p->role_allow; ra; ra = ra -> next) {
+        for (ra = p->role_allow; ra; ra = ra->next) {
                 cond_resched();
                 kfree(lra);
                 lra = ra;
         }
         kfree(lra);
 
-        for (rt = p->range_tr; rt; rt = rt -> next) {
+        for (rt = p->range_tr; rt; rt = rt->next) {
                 cond_resched();
                 if (lrt) {
                         ebitmap_destroy(&lrt->target_range.level[0].cat);
@@ -924,7 +924,7 @@ static int perm_read(struct policydb *p, struct hashtab *h, void *fp)
         len = le32_to_cpu(buf[0]);
         perdatum->value = le32_to_cpu(buf[1]);
 
-        key = kmalloc(len + 1,GFP_KERNEL);
+        key = kmalloc(len + 1, GFP_KERNEL);
         if (!key) {
                 rc = -ENOMEM;
                 goto bad;
@@ -971,7 +971,7 @@ static int common_read(struct policydb *p, struct hashtab *h, void *fp)
         comdatum->permissions.nprim = le32_to_cpu(buf[2]);
         nel = le32_to_cpu(buf[3]);