[patch 1/2] selinux: ARRAY_SIZE cleanups

[Stephen Smalley <sds@tycho.nsa.gov>]

From: Nicolas Kaiser <nikai@nikai.net>

Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]).

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>

---

 security/selinux/selinuxfs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -X /home/sds/dontdiff -rup linux-2.6.15-rc5-mm1/security/selinux/selinuxfs.c a/security/selinux/selinuxfs.c
--- linux-2.6.15-rc5-mm1/security/selinux/selinuxfs.c	2005-12-05 09:07:04.000000000 -0500
+++ a/security/selinux/selinuxfs.c	2005-12-05 09:10:23.000000000 -0500
@@ -376,7 +376,7 @@ static ssize_t selinux_transaction_write
 	char *data;
 	ssize_t rv;
 
-	if (ino >= sizeof(write_op)/sizeof(write_op[0]) || !write_op[ino])
+	if (ino >= ARRAY_SIZE(write_op) || !write_op[ino])
 		return -EINVAL;
 
 	data = simple_transaction_get(file, buf, size);
@@ -1161,7 +1161,7 @@ static int sel_make_avc_files(struct den
 #endif
 	};
 
-	for (i = 0; i < sizeof (files) / sizeof (files[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(files); i++) {
 		struct inode *inode;
 		struct dentry *dentry;
 

-- 
Stephen Smalley
National Security Agency

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/