diff options
author | Bruce Evans <bde@FreeBSD.org> | 1995-11-11 00:09:21 +0000 |
---|---|---|
committer | Bruce Evans <bde@FreeBSD.org> | 1995-11-11 00:09:21 +0000 |
commit | 3c8e79dd2b99547582a695f32df782e1259eddc7 (patch) | |
tree | f40072ac50d9b58cd956fc947e2f76035e63b9f9 /sys/kern/kern_sysctl.c | |
parent | ddae6790a3939dc0347041458d5dacb3bbbd5a85 (diff) | |
download | src-test2-3c8e79dd2b99547582a695f32df782e1259eddc7.tar.gz src-test2-3c8e79dd2b99547582a695f32df782e1259eddc7.zip |
Notes
Diffstat (limited to 'sys/kern/kern_sysctl.c')
-rw-r--r-- | sys/kern/kern_sysctl.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 4c36b913afcc..89a0d83345ad 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $Id: kern_sysctl.c,v 1.34 1995/11/10 09:58:53 phk Exp $ + * $Id: kern_sysctl.c,v 1.35 1995/11/10 16:22:41 phk Exp $ */ /* @@ -170,13 +170,16 @@ SYSCTL_PROC(_kern, KERN_HOSTNAME, hostname, CTLTYPE_STRING|CTLFLAG_RW, &hostname, sizeof(hostname), sysctl_kern_hostname, ""); static int -sysctl_order_cmp(void *a, void *b) +sysctl_order_cmp(const void *a, const void *b) { - struct sysctl_oid **pa,**pb; - pa = (struct sysctl_oid**) a; - pb = (struct sysctl_oid**) b; - if (!*pa) return 1; - if (!*pb) return -1; + const struct sysctl_oid **pa, **pb; + + pa = (const struct sysctl_oid **)a; + pb = (const struct sysctl_oid **)b; + if (*pa == NULL) + return (1); + if (*pb == NULL) + return (-1); return ((*pa)->oid_number - (*pb)->oid_number); } @@ -621,7 +624,7 @@ int securelevel = -1; /* * kernel related system variables. */ -int +static int kern_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) int *name; u_int namelen; |