Module Name: src
Committed By: joerg
Date: Thu Jun 12 22:10:04 UTC 2014
Modified Files:
src/sys/kern: kern_sysctl.c
Log Message:
Rename old/new to match syscalls.master.
To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 src/sys/kern/kern_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/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.250 src/sys/kern/kern_sysctl.c:1.251
--- src/sys/kern/kern_sysctl.c:1.250 Fri May 16 12:22:32 2014
+++ src/sys/kern/kern_sysctl.c Thu Jun 12 22:10:04 2014
@@ -1,4 +1,4 @@
-/* $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.
@@ -68,7 +68,7 @@
*/
#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"
@@ -298,14 +298,14 @@ sys___sysctl(struct lwp *l, const struct
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, new), SCARG(uap, newlen),
+ SCARG(uap, oldv), &oldlen,
+ SCARG(uap, newv), SCARG(uap, newlen),
&name[0], l, NULL);
/*
@@ -328,7 +328,7 @@ sys___sysctl(struct lwp *l, const struct
* 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);
