Module Name: src Committed By: msaitoh Date: Fri Mar 27 06:04:22 UTC 2009
Modified Files: src/sys/kern [netbsd-3-1]: init_sysctl.c Log Message: Pull up following revision(s) (requested by mrg in ticket #2000): usr.sbin/pstat/pstat.c: revision 1.113 convert getfiles() to use KERN_FILE2 sysctl. now it can survive "struct file" changing, as is upcoming. To generate a diff of this commit: cvs rdiff -u -r1.36.2.7 -r1.36.2.7.2.1 src/sys/kern/init_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/init_sysctl.c diff -u src/sys/kern/init_sysctl.c:1.36.2.7 src/sys/kern/init_sysctl.c:1.36.2.7.2.1 --- src/sys/kern/init_sysctl.c:1.36.2.7 Fri Apr 7 12:31:52 2006 +++ src/sys/kern/init_sysctl.c Fri Mar 27 06:04:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl.c,v 1.36.2.7 2006/04/07 12:31:52 tron Exp $ */ +/* $NetBSD: init_sysctl.c,v 1.36.2.7.2.1 2009/03/27 06:04:21 msaitoh Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.36.2.7 2006/04/07 12:31:52 tron Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.36.2.7.2.1 2009/03/27 06:04:21 msaitoh Exp $"); #include "opt_sysv.h" #include "opt_multiprocessor.h" @@ -1947,8 +1947,8 @@ dp += elem_size; len -= elem_size; } + needed += elem_size; if (elem_count > 0) { - needed += elem_size; if (elem_count != INT_MAX) elem_count--; } @@ -1981,8 +1981,8 @@ dp += elem_size; len -= elem_size; } + needed += elem_size; if (elem_count > 0) { - needed += elem_size; if (elem_count != INT_MAX) elem_count--; }