Module Name: src
Committed By: christos
Date: Sat Nov 24 07:16:05 UTC 2012
Modified Files:
src/lib/libc/arch/powerpc64/gen: syncicache.c
Log Message:
Use __arraycount(), and cast to u_int.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/powerpc64/gen/syncicache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/powerpc64/gen/syncicache.c
diff -u src/lib/libc/arch/powerpc64/gen/syncicache.c:1.1 src/lib/libc/arch/powerpc64/gen/syncicache.c:1.2
--- src/lib/libc/arch/powerpc64/gen/syncicache.c:1.1 Sat Jul 1 12:37:20 2006
+++ src/lib/libc/arch/powerpc64/gen/syncicache.c Sat Nov 24 02:16:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: syncicache.c,v 1.1 2006/07/01 16:37:20 ross Exp $ */
+/* $NetBSD: syncicache.c,v 1.2 2012/11/24 07:16:04 christos Exp $ */
/*
* Copyright (C) 1995-1997, 1999 Wolfgang Solfrank.
@@ -74,17 +74,16 @@ __getcachelinesize(void)
if (_cachelinesize)
return _cachelinesize;
- if (sysctl(cacheinfomib, sizeof(cacheinfomib) / sizeof(cacheinfomib[0]),
- &_cache_info, &clen, NULL, 0) == 0) {
+ if (sysctl(cacheinfomib, (u_int)__arraycount(cacheinfomib),
+ &_cache_info, &clen, NULL, 0) == 0) {
_cachelinesize = _cache_info.dcache_line_size;
return _cachelinesize;
}
/* Try older deprecated sysctl */
clen = sizeof(_cachelinesize);
- if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]),
- &_cachelinesize, &clen, NULL, 0) < 0
- || !_cachelinesize)
+ if (sysctl(cachemib, (u_int)__arraycount(cachemib),
+ &_cachelinesize, &clen, NULL, 0) < 0 || !_cachelinesize)
abort();
_cache_info.dcache_size = _cachelinesize;
