From 708694f704dd38c3511a3aea95cf7c72c863c25c Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Tue, 16 Jun 2015 20:19:00 +0000 Subject: [PATCH] Use nitems() macro instead of __arraycount() --- sys/kern/stack_protector.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/stack_protector.c b/sys/kern/stack_protector.c index b5f9973e24c..77be64f4d18 100644 --- a/sys/kern/stack_protector.c +++ b/sys/kern/stack_protector.c @@ -17,15 +17,14 @@ __stack_chk_fail(void) panic("stack overflow detected; backtrace may be corrupted"); } -#define __arraycount(__x) (sizeof(__x) / sizeof(__x[0])) static void __stack_chk_init(void *dummy __unused) { size_t i; - long guard[__arraycount(__stack_chk_guard)]; + long guard[nitems(__stack_chk_guard)]; arc4rand(guard, sizeof(guard), 0); - for (i = 0; i < __arraycount(guard); i++) + for (i = 0; i < nitems(guard); i++) __stack_chk_guard[i] = guard[i]; } SYSINIT(stack_chk, SI_SUB_RANDOM, SI_ORDER_ANY, __stack_chk_init, NULL); -- 2.45.2