Thu Jun 12 22:10:04 2014 UTC ()

Rename old/new to match syscalls.master.


(joerg)

diff -r1.250 -r1.251 src/sys/kern/kern_sysctl.c

--- src/sys/kern/kern_sysctl.c 2014/05/16 12:22:32	1.250
+++ src/sys/kern/kern_sysctl.c 2014/06/12 22:10:04	1.251

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_sysctl.c,v 1.250 2014/05/16 12:22:32 martin Exp $	*/
+/*	$NetBSD: kern_sysctl.c,v 1.251 2014/06/12 22:10:04 joerg Exp $	*/
 /*-
  * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Brown.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -58,27 +58,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_sysctl.c	8.9 (Berkeley) 5/20/95
  */
 /*
  * sysctl system call.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.250 2014/05/16 12:22:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.251 2014/06/12 22:10:04 joerg Exp $");
 #include "opt_defcorename.h"
 #include "ksyms.h"
 #include <sys/param.h>
 #define __COMPAT_SYSCTL
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/ksyms.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 @@ -288,57 +288,57 @@ sys___sysctl(struct lwp *l, const struct
 	/*
 	 * top-level sysctl names may or may not be non-terminal, but
 	 * we don't care
 	 */
 	if (SCARG(uap, namelen) > CTL_MAXNAME || SCARG(uap, namelen) < 1)
 		return (EINVAL);
 	error = copyin(SCARG(uap, name), &name,
 		       SCARG(uap, namelen) * sizeof(int));
 	if (error)
 		return (error);
 	ktrmib(name, SCARG(uap, namelen));
-	sysctl_lock(SCARG(uap, new) != NULL);
+	sysctl_lock(SCARG(uap, newv) != NULL);
 	/*
 	 * do sysctl work (NULL means main built-in default tree)
 	 */
 	error = sysctl_dispatch(&name[0], SCARG(uap, namelen),
-				SCARG(uap, old), &oldlen,
+				SCARG(uap, oldv), &oldlen,
-				SCARG(uap, new), SCARG(uap, newlen),
+				SCARG(uap, newv), SCARG(uap, newlen),
 				&name[0], l, NULL);
 	/*
 	 * release the sysctl lock
 	 */
 	sysctl_unlock();
 	/*
 	 * set caller's oldlen to new value even in the face of an
 	 * error (if this gets an error and they didn't have one, they
 	 * get this one)
 	 */
 	if (oldlenp) {
 		nerror = copyout(&oldlen, oldlenp, sizeof(oldlen));
 		if (error == 0)
 			error = nerror;
+	}
 	/*
 	 * if the only problem is that we weren't given enough space,
 	 * that's an ENOMEM error
 	 */
-	if (error == 0 && SCARG(uap, old) != NULL && savelen < oldlen)
+	if (error == 0 && SCARG(uap, oldv) != NULL && savelen < oldlen)
 		error = ENOMEM;
 	return (error);
+}
 /*
  * ********************************************************************
  * Section 1: How the tree is used
  * ********************************************************************
  * Implementations of sysctl for emulations should typically need only
  * these three functions in this order: lock the tree, dispatch
  * request into it, unlock the tree.
  * ********************************************************************