diff options
Diffstat (limited to 'sys/compat')
| -rw-r--r-- | sys/compat/common/kern_info_09.c | 6 | ||||
| -rw-r--r-- | sys/compat/common/kern_info_43.c | 4 | ||||
| -rw-r--r-- | sys/compat/hpux/hpux_compat.c | 5 | ||||
| -rw-r--r-- | sys/compat/ibcs2/ibcs2_stat.c | 4 | ||||
| -rw-r--r-- | sys/compat/linux/linux_misc.c | 9 | ||||
| -rw-r--r-- | sys/compat/osf1/osf1_misc.c | 4 | ||||
| -rw-r--r-- | sys/compat/sunos/sunos_misc.c | 4 | ||||
| -rw-r--r-- | sys/compat/svr4/svr4_stat.c | 12 | ||||
| -rw-r--r-- | sys/compat/ultrix/ultrix_misc.c | 4 |
9 files changed, 25 insertions, 27 deletions
diff --git a/sys/compat/common/kern_info_09.c b/sys/compat/common/kern_info_09.c index 1c84d9e1a13..27b44bef1f8 100644 --- a/sys/compat/common/kern_info_09.c +++ b/sys/compat/common/kern_info_09.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_info_09.c,v 1.8 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: kern_info_09.c,v 1.9 2002/03/14 20:31:31 mickey Exp $ */ /* $NetBSD: kern_info_09.c,v 1.5 1996/02/21 00:10:59 cgd Exp $ */ /* @@ -114,8 +114,8 @@ compat_09_sys_uname(p, v, retval) syscallarg(struct outsname *) name; } */ *uap = v; struct outsname outsname; - char *cp, *dp, *ep; - extern char ostype[], osrelease[]; + const char *cp; + char *dp, *ep; strncpy(outsname.sysname, ostype, sizeof(outsname.sysname)); strncpy(outsname.nodename, hostname, sizeof(outsname.nodename)); diff --git a/sys/compat/common/kern_info_43.c b/sys/compat/common/kern_info_43.c index 387c78cf3d0..ed6928800b2 100644 --- a/sys/compat/common/kern_info_43.c +++ b/sys/compat/common/kern_info_43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_info_43.c,v 1.11 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: kern_info_43.c,v 1.12 2002/03/14 20:31:31 mickey Exp $ */ /* $NetBSD: kern_info_43.c,v 1.5 1996/02/04 02:02:22 christos Exp $ */ /* @@ -205,7 +205,7 @@ compat_43_sys_getkerninfo(p, v, retval) int error, name[5]; size_t size; - extern char ostype[], osrelease[], machine[]; + extern char machine[]; if (SCARG(uap, size) && (error = copyin((caddr_t)SCARG(uap, size), (caddr_t)&size, sizeof(size)))) diff --git a/sys/compat/hpux/hpux_compat.c b/sys/compat/hpux/hpux_compat.c index 6edaff6840a..f537a2d370e 100644 --- a/sys/compat/hpux/hpux_compat.c +++ b/sys/compat/hpux/hpux_compat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_compat.c,v 1.18 2002/03/14 01:26:49 millert Exp $ */ +/* $OpenBSD: hpux_compat.c,v 1.19 2002/03/14 20:31:31 mickey Exp $ */ /* $NetBSD: hpux_compat.c,v 1.35 1997/05/08 16:19:48 mycroft Exp $ */ /* @@ -386,8 +386,7 @@ hpux_sys_utssys(p, v, retval) int i; int error; struct hpux_utsname ut; - extern char ostype[], hostname[], osrelease[], version[]; - extern char machine[]; + extern char hostname[], machine[]; switch (SCARG(uap, request)) { /* uname */ diff --git a/sys/compat/ibcs2/ibcs2_stat.c b/sys/compat/ibcs2/ibcs2_stat.c index 28bee548f1c..04534fc0eca 100644 --- a/sys/compat/ibcs2/ibcs2_stat.c +++ b/sys/compat/ibcs2/ibcs2_stat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ibcs2_stat.c,v 1.8 2002/03/14 01:26:50 millert Exp $ */ +/* $OpenBSD: ibcs2_stat.c,v 1.9 2002/03/14 20:31:31 mickey Exp $ */ /* $NetBSD: ibcs2_stat.c,v 1.5 1996/05/03 17:05:32 christos Exp $ */ /* @@ -259,7 +259,7 @@ ibcs2_sys_utssys(p, v, retval) case 0: /* uname(2) */ { struct ibcs2_utsname sut; - extern char ostype[], machine[], osrelease[]; + extern char machine[]; bzero(&sut, ibcs2_utsname_len); bcopy(ostype, sut.sysname, sizeof(sut.sysname) - 1); diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 0d72112a04a..17ed62e7b22 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_misc.c,v 1.41 2002/03/14 01:26:50 millert Exp $ */ +/* $OpenBSD: linux_misc.c,v 1.42 2002/03/14 20:31:31 mickey Exp $ */ /* $NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $ */ /* @@ -521,8 +521,7 @@ linux_sys_uname(p, v, retval) struct linux_sys_uname_args /* { syscallarg(struct linux_utsname *) up; } */ *uap = v; - extern char ostype[], hostname[], osrelease[], version[], machine[], - domainname[]; + extern char hostname[], machine[], domainname[]; struct linux_utsname luts; int len; char *cp; @@ -558,7 +557,7 @@ linux_sys_olduname(p, v, retval) struct linux_sys_uname_args /* { syscallarg(struct linux_oldutsname *) up; } */ *uap = v; - extern char ostype[], hostname[], osrelease[], version[], machine[]; + extern char hostname[], machine[]; struct linux_oldutsname luts; int len; char *cp; @@ -587,7 +586,7 @@ linux_sys_oldolduname(p, v, retval) struct linux_sys_uname_args /* { syscallarg(struct linux_oldoldutsname *) up; } */ *uap = v; - extern char ostype[], hostname[], osrelease[], version[], machine[]; + extern char hostname[], machine[]; struct linux_oldoldutsname luts; int len; char *cp; diff --git a/sys/compat/osf1/osf1_misc.c b/sys/compat/osf1/osf1_misc.c index 13191c7dcce..de227667a5c 100644 --- a/sys/compat/osf1/osf1_misc.c +++ b/sys/compat/osf1/osf1_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: osf1_misc.c,v 1.13 2000/08/12 20:46:42 ericj Exp $ */ +/* $OpenBSD: osf1_misc.c,v 1.14 2002/03/14 20:31:31 mickey Exp $ */ /* $NetBSD: osf1_misc.c,v 1.55 2000/06/28 15:39:33 mrg Exp $ */ /* @@ -240,7 +240,7 @@ osf1_sys_uname(p, v, retval) struct osf1_sys_uname_args *uap = v; struct osf1_utsname u; const char *cp; - extern char ostype[], hostname[], osrelease[], version[], machine[]; + extern char hostname[], machine[]; char *dp, *ep; /* XXX would use stackgap, but our struct utsname is too big! */ diff --git a/sys/compat/sunos/sunos_misc.c b/sys/compat/sunos/sunos_misc.c index b46a5c89020..69e0cd7c05e 100644 --- a/sys/compat/sunos/sunos_misc.c +++ b/sys/compat/sunos/sunos_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sunos_misc.c,v 1.36 2002/03/14 01:26:50 millert Exp $ */ +/* $OpenBSD: sunos_misc.c,v 1.37 2002/03/14 20:31:31 mickey Exp $ */ /* $NetBSD: sunos_misc.c,v 1.65 1996/04/22 01:44:31 christos Exp $ */ /* @@ -636,7 +636,7 @@ sunos_sys_uname(p, v, retval) { struct sunos_sys_uname_args *uap = v; struct sunos_utsname sut; - extern char ostype[], machine[], osrelease[]; + extern char machine[]; bzero(&sut, sizeof(sut)); diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c index d9698f40084..e72c58b1f81 100644 --- a/sys/compat/svr4/svr4_stat.c +++ b/sys/compat/svr4/svr4_stat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_stat.c,v 1.21 2002/03/14 01:26:51 millert Exp $ */ +/* $OpenBSD: svr4_stat.c,v 1.22 2002/03/14 20:31:31 mickey Exp $ */ /* $NetBSD: svr4_stat.c,v 1.21 1996/04/22 01:16:07 christos Exp $ */ /* @@ -523,8 +523,9 @@ svr4_sys_uname(p, v, retval) { struct svr4_sys_uname_args *uap = v; struct svr4_utsname sut; - extern char ostype[], hostname[], osrelease[], version[], machine[]; - char *cp, *dp, *ep; + extern char hostname[], machine[]; + const char *cp; + char *dp, *ep; bzero(&sut, sizeof(sut)); @@ -563,12 +564,11 @@ svr4_sys_systeminfo(p, v, retval) register_t *retval; { struct svr4_sys_systeminfo_args *uap = v; - char *str; + const char *str; int name; int error; long len; - extern char ostype[], hostname[], osrelease[], - version[], machine[], domainname[]; + extern char hostname[], machine[], domainname[]; #ifdef __sparc__ extern char *cpu_class; #endif diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c index 7860af1e99e..3dd59b3e51e 100644 --- a/sys/compat/ultrix/ultrix_misc.c +++ b/sys/compat/ultrix/ultrix_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ultrix_misc.c,v 1.25 2002/03/14 03:16:03 millert Exp $ */ +/* $OpenBSD: ultrix_misc.c,v 1.26 2002/03/14 20:31:31 mickey Exp $ */ /* $NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $ */ /* @@ -401,7 +401,7 @@ ultrix_sys_uname(p, v, retval) { struct ultrix_sys_uname_args *uap = v; struct ultrix_utsname sut; - extern char ostype[], machine[], osrelease[]; + extern char machine[]; bzero(&sut, sizeof(sut)); |