[Selinux-commits] SF.net SVN: selinux: [1993] trunk/checkpolicy

[<ssm...@us...>]

Revision: 1993
Author:   ssmalley
Date:     2006-08-24 09:05:06 -0700 (Thu, 24 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/selinux/?rev=1993&view=rev

Log Message:
-----------
Apply the new make indent to the tree.

Modified Paths:
--------------
    trunk/checkpolicy/module_compiler.c
    trunk/libselinux/src/fgetfilecon.c
    trunk/libselinux/src/getfilecon.c
    trunk/libselinux/src/lgetfilecon.c
    trunk/libselinux/src/procattr.c
    trunk/libsemanage/src/semanage_store.c
    trunk/libsepol/src/link.c
    trunk/libsepol/src/mls.c
    trunk/libsepol/src/users.c
Modified: trunk/checkpolicy/module_compiler.c
===================================================================
--- trunk/checkpolicy/module_compiler.c	2006-08-24 16:01:45 UTC (rev 1992)
+++ trunk/checkpolicy/module_compiler.c	2006-08-24 16:05:06 UTC (rev 1993)
@@ -138,8 +138,9 @@
 			       SCOPE_DECL, decl->decl_id, dest_value);
 	if (retval == 1) {
 		symtab_datum_t *s =
-		    (symtab_datum_t *)hashtab_search(policydbp->symtab[symbol_type].
-						table, key);
+		    (symtab_datum_t *) hashtab_search(policydbp->
+						      symtab[symbol_type].table,
+						      key);
 		assert(s != NULL);
 		*dest_value = s->value;
 	} else if (retval == -2) {
@@ -491,8 +492,9 @@
 			       SCOPE_REQ, decl->decl_id, dest_value);
 	if (retval == 1) {
 		symtab_datum_t *s =
-		    (symtab_datum_t *) hashtab_search(policydbp->symtab[symbol_type].
-						      table, key);
+		    (symtab_datum_t *) hashtab_search(policydbp->
+						      symtab[symbol_type].table,
+						      key);
 		assert(s != NULL);
 		*dest_value = s->value;
 	} else if (retval == -2) {
@@ -1018,7 +1020,8 @@
 	if (perdatum == NULL) {
 		return 1;
 	}
-	return is_perm_in_stack(perdatum->s.value, cladatum->s.value, stack_top);
+	return is_perm_in_stack(perdatum->s.value, cladatum->s.value,
+				stack_top);
 }
 
 cond_list_t *get_current_cond_list(cond_list_t * cond)

Modified: trunk/libselinux/src/fgetfilecon.c
===================================================================
--- trunk/libselinux/src/fgetfilecon.c	2006-08-24 16:01:45 UTC (rev 1992)
+++ trunk/libselinux/src/fgetfilecon.c	2006-08-24 16:05:06 UTC (rev 1993)
@@ -59,7 +59,7 @@
 	}
 
 	if (ret >= 0 && *context)
-		return strlen(*context)+1;
+		return strlen(*context) + 1;
 
 	return ret;
 }

Modified: trunk/libselinux/src/getfilecon.c
===================================================================
--- trunk/libselinux/src/getfilecon.c	2006-08-24 16:01:45 UTC (rev 1992)
+++ trunk/libselinux/src/getfilecon.c	2006-08-24 16:05:06 UTC (rev 1993)
@@ -58,7 +58,7 @@
 		freecon(rcontext);
 	}
 	if (ret >= 0 && *context)
-		return strlen(*context)+1;
+		return strlen(*context) + 1;
 
 	return ret;
 }

Modified: trunk/libselinux/src/lgetfilecon.c
===================================================================
--- trunk/libselinux/src/lgetfilecon.c	2006-08-24 16:01:45 UTC (rev 1992)
+++ trunk/libselinux/src/lgetfilecon.c	2006-08-24 16:05:06 UTC (rev 1993)
@@ -59,6 +59,6 @@
 	}
 
 	if (ret >= 0 && *context)
-		return strlen(*context)+1;
+		return strlen(*context) + 1;
 	return ret;
 }

Modified: trunk/libselinux/src/procattr.c
===================================================================
--- trunk/libselinux/src/procattr.c	2006-08-24 16:01:45 UTC (rev 1992)
+++ trunk/libselinux/src/procattr.c	2006-08-24 16:05:06 UTC (rev 1993)
@@ -8,14 +8,13 @@
 #include "selinux_internal.h"
 #include "policy.h"
 
-static pid_t gettid(void) 
+static pid_t gettid(void)
 {
 	return syscall(__NR_gettid);
 }
 
 static int getprocattrcon_raw(security_context_t * context,
-			      pid_t pid,
-			      const char *attr)
+			      pid_t pid, const char *attr)
 {
 	char *path, *buf;
 	size_t size;
@@ -72,9 +71,8 @@
 	return ret;
 }
 
-static int getprocattrcon(security_context_t * context, 
-			  pid_t pid,
-			  const char *attr)
+static int getprocattrcon(security_context_t * context,
+			  pid_t pid, const char *attr)
 {
 	int ret;
 	security_context_t rcontext;
@@ -89,9 +87,8 @@
 	return ret;
 }
 
-static int setprocattrcon_raw(security_context_t context, 
-			      pid_t pid,
-			      const char *attr)
+static int setprocattrcon_raw(security_context_t context,
+			      pid_t pid, const char *attr)
 {
 	char *path;
 	int fd, rc;
@@ -129,9 +126,8 @@
 		return 0;
 }
 
-static int setprocattrcon(security_context_t context, 
-			  pid_t pid,
-			  const char *attr)
+static int setprocattrcon(security_context_t context,
+			  pid_t pid, const char *attr)
 {
 	int ret;
 	security_context_t rcontext = context;
@@ -179,31 +175,31 @@
 	{ \
 		return getprocattrcon(c, pid, #attr); \
 	}
-		
+
 all_selfattr_def(con, current)
-getpidattr_def(pidcon, current)
-getselfattr_def(prevcon, prev)
-all_selfattr_def(execcon, exec)
-all_selfattr_def(fscreatecon, fscreate)
-all_selfattr_def(sockcreatecon, sockcreate)
-all_selfattr_def(keycreatecon, keycreate)
+    getpidattr_def(pidcon, current)
+    getselfattr_def(prevcon, prev)
+    all_selfattr_def(execcon, exec)
+    all_selfattr_def(fscreatecon, fscreate)
+    all_selfattr_def(sockcreatecon, sockcreate)
+    all_selfattr_def(keycreatecon, keycreate)
 
-hidden_def(getcon_raw)
-hidden_def(getcon)
-hidden_def(getexeccon_raw)
-hidden_def(getfilecon_raw)
-hidden_def(getfilecon)
-hidden_def(getfscreatecon_raw)
-hidden_def(getkeycreatecon_raw)
-hidden_def(getpeercon_raw)
-hidden_def(getpidcon_raw)
-hidden_def(getprevcon_raw)
-hidden_def(getprevcon)
-hidden_def(getsockcreatecon_raw)
-hidden_def(setcon_raw)
-hidden_def(setexeccon_raw)
-hidden_def(setexeccon)
-hidden_def(setfilecon_raw)
-hidden_def(setfscreatecon_raw)
-hidden_def(setkeycreatecon_raw)
-hidden_def(setsockcreatecon_raw)
+    hidden_def(getcon_raw)
+    hidden_def(getcon)
+    hidden_def(getexeccon_raw)
+    hidden_def(getfilecon_raw)
+    hidden_def(getfilecon)
+    hidden_def(getfscreatecon_raw)
+    hidden_def(getkeycreatecon_raw)
+    hidden_def(getpeercon_raw)
+    hidden_def(getpidcon_raw)
+    hidden_def(getprevcon_raw)
+    hidden_def(getprevcon)
+    hidden_def(getsockcreatecon_raw)
+    hidden_def(setcon_raw)
+    hidden_def(setexeccon_raw)
+    hidden_def(setexeccon)
+    hidden_def(setfilecon_raw)
+    hidden_def(setfscreatecon_raw)
+    hidden_def(setkeycreatecon_raw)
+    hidden_def(setsockcreatecon_raw)

Modified: trunk/libsemanage/src/semanage_store.c
===================================================================
--- trunk/libsemanage/src/semanage_store.c	2006-08-24 16:01:45 UTC (rev 1992)
+++ trunk/libsemanage/src/semanage_store.c	2006-08-24 16:05:06 UTC (rev 1993)
@@ -1068,20 +1068,25 @@
 	}
 
 	snprintf(store_fc_loc, PATH_MAX, "%s%s", storepath, running_fc_loc);
-	if (semanage_copy_file(active_fc_loc, store_fc_loc, sh->conf->file_mode) == -1 && errno != ENOENT) {
-		ERR(sh, "Could not copy %s to %s.", active_fc_loc, store_fc_loc);
+	if (semanage_copy_file(active_fc_loc, store_fc_loc, sh->conf->file_mode)
+	    == -1 && errno != ENOENT) {
+		ERR(sh, "Could not copy %s to %s.", active_fc_loc,
+		    store_fc_loc);
 		goto cleanup;
 	}
 
 	snprintf(store_seusers, PATH_MAX, "%s%s", storepath, running_seusers);
 	if (semanage_copy_file
-	    (active_seusers, store_seusers, sh->conf->file_mode) == -1 && errno != ENOENT) {
-		ERR(sh, "Could not copy %s to %s.", active_seusers, store_seusers);
+	    (active_seusers, store_seusers, sh->conf->file_mode) == -1
+	    && errno != ENOENT) {
+		ERR(sh, "Could not copy %s to %s.", active_seusers,
+		    store_seusers);
 		goto cleanup;
 	}
 
 	snprintf(store_nc, PATH_MAX, "%s%s", storepath, running_nc);
-	if (semanage_copy_file(active_nc, store_nc, sh->conf->file_mode) == -1 && errno != ENOENT) {
+	if (semanage_copy_file(active_nc, store_nc, sh->conf->file_mode) == -1
+	    && errno != ENOENT) {
 		ERR(sh, "Could not copy %s to %s.", active_nc, store_nc);
 		goto cleanup;
 	}

Modified: trunk/libsepol/src/link.c
===================================================================
--- trunk/libsepol/src/link.c	2006-08-24 16:01:45 UTC (rev 1992)
+++ trunk/libsepol/src/link.c	2006-08-24 16:05:06 UTC (rev 1993)
@@ -278,7 +278,8 @@
 		}
 	}
 
-	state->cur->map[SYM_CLASSES][cladatum->s.value - 1] = new_class->s.value;
+	state->cur->map[SYM_CLASSES][cladatum->s.value - 1] =
+	    new_class->s.value;
 
 	/* copy permissions */
 	state->src_class = cladatum;

Modified: trunk/libsepol/src/mls.c
===================================================================
--- trunk/libsepol/src/mls.c	2006-08-24 16:01:45 UTC (rev 1992)
+++ trunk/libsepol/src/mls.c	2006-08-24 16:05:06 UTC (rev 1993)
@@ -403,7 +403,8 @@
 					if (!rngdatum)
 						goto err;
 
-					if (catdatum->s.value >= rngdatum->s.value)
+					if (catdatum->s.value >=
+					    rngdatum->s.value)
 						goto err;
 
 					for (i = catdatum->s.value;

Modified: trunk/libsepol/src/users.c
===================================================================
--- trunk/libsepol/src/users.c	2006-08-24 16:01:45 UTC (rev 1992)
+++ trunk/libsepol/src/users.c	2006-08-24 16:05:06 UTC (rev 1993)
@@ -332,7 +332,8 @@
 		return STATUS_SUCCESS;
 	}
 
-	if (user_to_record(handle, policydb, usrdatum->s.value - 1, response) < 0)
+	if (user_to_record(handle, policydb, usrdatum->s.value - 1, response) <
+	    0)
 		goto err;
 
 	return STATUS_SUCCESS;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.