Module Name: src
Committed By: alc
Date: Wed Jul 22 22:53:41 UTC 2009
Modified Files:
src/lib/libc/gen: sysctl.3 sysctlbyname.c
src/sys/sys: sysctl.h
Log Message:
Constify the fourth argument of sysctlbtname(3) (ie. `newp', the pointer to
the new value).
This change sync sysctl(3) and sysctlbtname(3) prototypes.
No objection on <tech-userlevel>
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/lib/libc/gen/sysctl.3
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/gen/sysctlbyname.c
cvs rdiff -u -r1.184 -r1.185 src/sys/sys/sysctl.h
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/gen/sysctl.3
diff -u src/lib/libc/gen/sysctl.3:1.196 src/lib/libc/gen/sysctl.3:1.197
--- src/lib/libc/gen/sysctl.3:1.196 Sun Jan 11 02:46:27 2009
+++ src/lib/libc/gen/sysctl.3 Wed Jul 22 22:53:41 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: sysctl.3,v 1.196 2009/01/11 02:46:27 christos Exp $
+.\" $NetBSD: sysctl.3,v 1.197 2009/07/22 22:53:41 alc Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -48,7 +48,7 @@
"const void *newp" "size_t newlen"
.Ft int
.Fn sysctlbyname "const char *sname" "void *oldp" "size_t *oldlenp" \
-"void *newp" "size_t newlen"
+"const void *newp" "size_t newlen"
.Ft int
.Fn sysctlgetmibinfo "const char *sname" "int *name" "u_int *namelenp" \
"char *cname" "size_t *csz" "struct sysctlnode **rnode" "int v"
Index: src/lib/libc/gen/sysctlbyname.c
diff -u src/lib/libc/gen/sysctlbyname.c:1.4 src/lib/libc/gen/sysctlbyname.c:1.5
--- src/lib/libc/gen/sysctlbyname.c:1.4 Tue Apr 29 06:53:01 2008
+++ src/lib/libc/gen/sysctlbyname.c Wed Jul 22 22:53:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctlbyname.c,v 1.4 2008/04/29 06:53:01 martin Exp $ */
+/* $NetBSD: sysctlbyname.c,v 1.5 2009/07/22 22:53:41 alc Exp $ */
/*-
* Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysctlbyname.c,v 1.4 2008/04/29 06:53:01 martin Exp $");
+__RCSID("$NetBSD: sysctlbyname.c,v 1.5 2009/07/22 22:53:41 alc Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -46,8 +46,8 @@
* trivial sysctlbyname() function for the "lazy".
*/
int
-sysctlbyname(const char *gname, void *oldp, size_t *oldlenp, void *newp,
- size_t newlen)
+sysctlbyname(const char *gname, void *oldp, size_t *oldlenp,
+ const void *newp, size_t newlen)
{
int name[CTL_MAXNAME], rc;
u_int namelen;
Index: src/sys/sys/sysctl.h
diff -u src/sys/sys/sysctl.h:1.184 src/sys/sys/sysctl.h:1.185
--- src/sys/sys/sysctl.h:1.184 Sun Mar 29 01:02:50 2009
+++ src/sys/sys/sysctl.h Wed Jul 22 22:53:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.h,v 1.184 2009/03/29 01:02:50 mrg Exp $ */
+/* $NetBSD: sysctl.h,v 1.185 2009/07/22 22:53:41 alc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -1205,7 +1205,7 @@
__BEGIN_DECLS
int sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
-int sysctlbyname(const char *, void *, size_t *, void *, size_t);
+int sysctlbyname(const char *, void *, size_t *, const void *, size_t);
int sysctlgetmibinfo(const char *, int *, u_int *,
char *, size_t *, struct sysctlnode **, int);
int sysctlnametomib(const char *, int *, size_t *);
