diff options
| -rw-r--r-- | sys/kern/kern_sysctl.c | 9 | ||||
| -rw-r--r-- | sys/sys/sysctl.h | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 8bb61b8c666..b0cabd1e641 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.62 2002/03/01 02:52:51 provos Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.63 2002/03/14 19:42:54 mickey Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -241,7 +241,7 @@ kern_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) struct proc *p; { int error, level, inthostid, oldsgap; - extern char ostype[], osrelease[], osversion[], version[]; + extern char ostype[], osrelease[], osversion[]; extern int somaxconn, sominconn; extern int usermount, nosuidcoredump; extern long cp_time[CPUSTATES]; @@ -714,7 +714,7 @@ sysctl_rdstring(oldp, oldlenp, newp, str) void *oldp; size_t *oldlenp; void *newp; - char *str; + const char *str; { int len, error = 0; @@ -765,7 +765,8 @@ int sysctl_rdstruct(oldp, oldlenp, newp, sp, len) void *oldp; size_t *oldlenp; - void *newp, *sp; + void *newp; + const void *sp; int len; { int error = 0; diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 1b452ceae7f..12123791f10 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.h,v 1.47 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: sysctl.h,v 1.48 2002/03/14 19:42:54 mickey Exp $ */ /* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */ /* @@ -430,8 +430,8 @@ int sysctl_rdquad(void *, size_t *, void *, int64_t); int sysctl_string(void *, size_t *, void *, size_t, char *, int); int sysctl_tstring(void *, size_t *, void *, size_t, char *, int); int sysctl__string(void *, size_t *, void *, size_t, char *, int, int); -int sysctl_rdstring(void *, size_t *, void *, char *); -int sysctl_rdstruct(void *, size_t *, void *, void *, int); +int sysctl_rdstring(void *, size_t *, void *, const char *); +int sysctl_rdstruct(void *, size_t *, void *, const void *, int); int sysctl_struct(void *, size_t *, void *, size_t, void *, int); int sysctl_file(char *, size_t *); int sysctl_doproc(int *, u_int, char *, size_t *); @@ -441,8 +441,6 @@ int sysctl_dumpentry(struct radix_node *, void *); int sysctl_iflist(int, struct walkarg *); int sysctl_rtable(int *, u_int, void *, size_t *, void *, size_t); int sysctl_clockrate(char *, size_t *); -int sysctl_rdstring(void *, size_t *, void *, char *); -int sysctl_rdstruct(void *, size_t *, void *, void *, int); int sysctl_vnode(char *, size_t *, struct proc *); int sysctl_ntptime(char *, size_t *); #ifdef GPROF |