Module Name: src Committed By: msaitoh Date: Fri Mar 27 10:43:35 UTC 2009
Modified Files: src/sys/kern [netbsd-3-0]: init_sysctl.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1999): sys/kern/init_sysctl.c: revision 1.158 always calculate "needed" for KERN_FILE2 calls. this allows a caller to get an estimate of the needed space, like the intention is. To generate a diff of this commit: cvs rdiff -u -r1.36.2.6 -r1.36.2.6.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.6 src/sys/kern/init_sysctl.c:1.36.2.6.2.1 --- src/sys/kern/init_sysctl.c:1.36.2.6 Thu Sep 8 21:06:30 2005 +++ src/sys/kern/init_sysctl.c Fri Mar 27 10:43:35 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl.c,v 1.36.2.6 2005/09/08 21:06:30 tron Exp $ */ +/* $NetBSD: init_sysctl.c,v 1.36.2.6.2.1 2009/03/27 10:43:35 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.6 2005/09/08 21:06:30 tron Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.36.2.6.2.1 2009/03/27 10:43:35 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--; }