diff options
author | pfg <pfg@FreeBSD.org> | 2015-06-16 20:19:00 +0000 |
---|---|---|
committer | pfg <pfg@FreeBSD.org> | 2015-06-16 20:19:00 +0000 |
commit | 5c69b03a620c29c084eccd354f03f31d48b2d8cc (patch) | |
tree | 1b349ac0ebec74969668160589ab3d743e9f55bc | |
parent | 49fddee16cf34fece7084c6a6ad9eeaab154daa5 (diff) | |
download | FreeBSD-src-5c69b03a620c29c084eccd354f03f31d48b2d8cc.zip FreeBSD-src-5c69b03a620c29c084eccd354f03f31d48b2d8cc.tar.gz |
Use nitems() macro instead of __arraycount()
-rw-r--r-- | sys/kern/stack_protector.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/kern/stack_protector.c b/sys/kern/stack_protector.c index b5f9973..77be64f 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); |