diff options
28 files changed, 80 insertions, 79 deletions
diff --git a/sys/adosfs/advfsops.c b/sys/adosfs/advfsops.c index 8f82094e993..7aef686aa4f 100644 --- a/sys/adosfs/advfsops.c +++ b/sys/adosfs/advfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: advfsops.c,v 1.12 1997/11/10 23:57:05 niklas Exp $ */ +/* $OpenBSD: advfsops.c,v 1.13 1998/02/08 22:41:31 tholo Exp $ */ /* $NetBSD: advfsops.c,v 1.24 1996/12/22 10:10:12 cgd Exp $ */ /* @@ -51,7 +51,7 @@ #include <adosfs/adosfs.h> int adosfs_init __P((struct vfsconf *)); -int adosfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, +int adosfs_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int adosfs_start __P((struct mount *, int, struct proc *)); int adosfs_unmount __P((struct mount *, int, struct proc *)); @@ -71,7 +71,7 @@ int adosfs_loadbitmap __P((struct adosfsmount *)); int adosfs_mount(mp, path, data, ndp, p) struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/isofs/cd9660/cd9660_extern.h b/sys/isofs/cd9660/cd9660_extern.h index 3bd0cd8b662..c53d6c53e33 100644 --- a/sys/isofs/cd9660/cd9660_extern.h +++ b/sys/isofs/cd9660/cd9660_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_extern.h,v 1.1 1997/11/08 20:54:29 niklas Exp $ */ +/* $OpenBSD: cd9660_extern.h,v 1.2 1998/02/08 22:41:32 tholo Exp $ */ /* $NetBSD: cd9660_extern.h,v 1.1 1997/01/24 00:24:53 cgd Exp $ */ /*- @@ -83,7 +83,7 @@ struct iso_mnt { #define blksize(imp, ip, lbn) ((imp)->logical_block_size) int cd9660_mount __P((struct mount *, - char *, caddr_t, struct nameidata *, struct proc *)); + const char *, caddr_t, struct nameidata *, struct proc *)); int cd9660_start __P((struct mount *, int, struct proc *)); int cd9660_unmount __P((struct mount *, int, struct proc *)); int cd9660_root __P((struct mount *, struct vnode **)); diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index 8978dd8f650..923c285ef8b 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vfsops.c,v 1.12 1997/11/08 17:21:08 niklas Exp $ */ +/* $OpenBSD: cd9660_vfsops.c,v 1.13 1998/02/08 22:41:32 tholo Exp $ */ /* $NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $ */ /*- @@ -131,7 +131,7 @@ cd9660_mountroot() int cd9660_mount(mp, path, data, ndp, p) register struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index b4e4d5f7d7b..a320ed66805 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_clock.c,v 1.17 1997/12/30 19:07:29 mickey Exp $ */ +/* $OpenBSD: kern_clock.c,v 1.18 1998/02/08 22:41:34 tholo Exp $ */ /* $NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $ */ /*- @@ -584,7 +584,8 @@ hardclock(frame) */ #ifdef PPS_SYNC pps_valid++; - if (pps_valid == PPS_VALID) { + if (pps_valid >= PPS_VALID) { + pps_valid = PPS_VALID; /* Avoid possible overflow */ pps_jitter = MAXTIME; pps_stabil = MAXFREQ; time_status &= ~(STA_PPSSIGNAL | STA_PPSJITTER | @@ -1019,7 +1020,7 @@ hardupdate(offset) return; ltemp = offset; #ifdef PPS_SYNC - if (time_status & STA_PPSTIME && time_status & STA_PPSSIGNAL) + if ((time_status & STA_PPSTIME) && (time_status & STA_PPSSIGNAL)) ltemp = pps_offset; #endif /* PPS_SYNC */ diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 6267afdb85b..0a383eb598d 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exec.c,v 1.15 1997/11/06 05:58:15 csapuntz Exp $ */ +/* $OpenBSD: kern_exec.c,v 1.16 1998/02/08 22:41:34 tholo Exp $ */ /* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */ /*- @@ -227,7 +227,7 @@ sys_execve(p, v, retval) struct vattr attr; struct ucred *cred = p->p_ucred; char *argp; - char **cpp, *dp, *sp; + char * const *cpp, *dp, *sp; long argc, envc; size_t len; char *stack; @@ -255,7 +255,7 @@ sys_execve(p, v, retval) /* * initialize the fields of the exec package. */ - pack.ep_name = SCARG(uap, path); + pack.ep_name = (char *)SCARG(uap, path); MALLOC(pack.ep_hdr, void *, exec_maxhdrsz, M_EXEC, M_WAITOK); pack.ep_hdrlen = exec_maxhdrsz; pack.ep_hdrvalid = 0; diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c index a5d284c1c6b..e88ddc9712d 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_ntptime.c,v 1.5 1997/08/29 20:44:25 kstailey Exp $ */ +/* $OpenBSD: kern_ntptime.c,v 1.6 1998/02/08 22:41:35 tholo Exp $ */ /* $NetBSD: kern_ntptime.c,v 1.2 1996/03/07 14:31:20 christos Exp $ */ /****************************************************************************** @@ -111,14 +111,14 @@ sys_ntp_gettime(p, v, retval) { struct sys_ntp_gettime_args /* { - syscallarg(struct timex *) tp; + syscallarg(struct timex *) ntvp; } */ *uap = v; struct timeval atv; struct ntptimeval ntv; int error = 0; int s; - if (SCARG(uap, tp)) { + if (SCARG(uap, ntvp)) { s = splclock(); #ifdef EXT_CLOCK /* @@ -142,7 +142,7 @@ sys_ntp_gettime(p, v, retval) ntv.esterror = time_esterror; (void) splx(s); - error = copyout((caddr_t)&ntv, (caddr_t)SCARG(uap, tp), + error = copyout((caddr_t)&ntv, (caddr_t)SCARG(uap, ntvp), sizeof (ntv)); } if (!error) { diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 6745f6b63b9..264ff8a758a 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_time.c,v 1.10 1997/10/17 04:41:10 millert Exp $ */ +/* $OpenBSD: kern_time.c,v 1.11 1998/02/08 22:41:35 tholo Exp $ */ /* $NetBSD: kern_time.c,v 1.20 1996/02/18 11:57:06 fvdl Exp $ */ /* @@ -445,7 +445,7 @@ sys_setitimer(p, v, retval) syscallarg(struct itimerval *) oitv; } */ *uap = v; struct itimerval aitv; - register struct itimerval *itvp; + register const struct itimerval *itvp; int s, error; if (SCARG(uap, which) > ITIMER_PROF) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 7ab4f5536b6..65290c40d67 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_syscalls.c,v 1.6 1997/12/16 22:59:12 provos Exp $ */ +/* $OpenBSD: uipc_syscalls.c,v 1.7 1998/02/08 22:41:36 tholo Exp $ */ /* $NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $ */ /* @@ -103,7 +103,7 @@ sys_bind(p, v, retval) { register struct sys_bind_args /* { syscallarg(int) s; - syscallarg(caddr_t) name; + syscallarg(struct sockaddr *) name; syscallarg(int) namelen; } */ *uap = v; struct file *fp; @@ -112,7 +112,7 @@ sys_bind(p, v, retval) if ((error = getsock(p->p_fd, SCARG(uap, s), &fp)) != 0) return (error); - error = sockargs(&nam, SCARG(uap, name), SCARG(uap, namelen), + error = sockargs(&nam, (caddr_t)SCARG(uap, name), SCARG(uap, namelen), MT_SONAME); if (error) return (error); @@ -148,7 +148,7 @@ sys_accept(p, v, retval) { register struct sys_accept_args /* { syscallarg(int) s; - syscallarg(caddr_t) name; + syscallarg(struct sockaddr *) name; syscallarg(int *) anamelen; } */ *uap = v; struct file *fp; @@ -229,7 +229,7 @@ sys_connect(p, v, retval) { register struct sys_connect_args /* { syscallarg(int) s; - syscallarg(caddr_t) name; + syscallarg(struct sockaddr *) name; syscallarg(int) namelen; } */ *uap = v; struct file *fp; @@ -242,7 +242,7 @@ sys_connect(p, v, retval) so = (struct socket *)fp->f_data; if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) return (EALREADY); - error = sockargs(&nam, SCARG(uap, name), SCARG(uap, namelen), + error = sockargs(&nam, (caddr_t)SCARG(uap, name), SCARG(uap, namelen), MT_SONAME); if (error) return (error); @@ -348,13 +348,13 @@ sys_sendto(p, v, retval) syscallarg(caddr_t) buf; syscallarg(size_t) len; syscallarg(int) flags; - syscallarg(caddr_t) to; + syscallarg(struct sockaddr *) to; syscallarg(int) tolen; } */ *uap = v; struct msghdr msg; struct iovec aiov; - msg.msg_name = SCARG(uap, to); + msg.msg_name = (caddr_t)SCARG(uap, to); msg.msg_namelen = SCARG(uap, tolen); msg.msg_iov = &aiov; msg.msg_iovlen = 1; @@ -362,7 +362,7 @@ sys_sendto(p, v, retval) #ifdef COMPAT_OLDSOCK msg.msg_flags = 0; #endif - aiov.iov_base = SCARG(uap, buf); + aiov.iov_base = (char *)SCARG(uap, buf); aiov.iov_len = SCARG(uap, len); return (sendit(p, SCARG(uap, s), &msg, SCARG(uap, flags), retval)); } @@ -523,7 +523,7 @@ sys_recvfrom(p, v, retval) syscallarg(caddr_t) buf; syscallarg(size_t) len; syscallarg(int) flags; - syscallarg(caddr_t) from; + syscallarg(struct sockaddr *) from; syscallarg(int *) fromlenaddr; } */ *uap = v; struct msghdr msg; @@ -538,7 +538,7 @@ sys_recvfrom(p, v, retval) return (error); } else msg.msg_namelen = 0; - msg.msg_name = SCARG(uap, from); + msg.msg_name = (caddr_t)SCARG(uap, from); msg.msg_iov = &aiov; msg.msg_iovlen = 1; aiov.iov_base = SCARG(uap, buf); diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c index 34801f8edb6..358ad6892ee 100644 --- a/sys/miscfs/fdesc/fdesc_vfsops.c +++ b/sys/miscfs/fdesc/fdesc_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdesc_vfsops.c,v 1.5 1997/11/06 05:58:32 csapuntz Exp $ */ +/* $OpenBSD: fdesc_vfsops.c,v 1.6 1998/02/08 22:41:37 tholo Exp $ */ /* $NetBSD: fdesc_vfsops.c,v 1.21 1996/02/09 22:40:07 christos Exp $ */ /* @@ -58,7 +58,7 @@ #include <sys/malloc.h> #include <miscfs/fdesc/fdesc.h> -int fdesc_mount __P((struct mount *, char *, caddr_t, +int fdesc_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int fdesc_start __P((struct mount *, int, struct proc *)); int fdesc_unmount __P((struct mount *, int, struct proc *)); @@ -78,7 +78,7 @@ int fdesc_vptofh __P((struct vnode *, struct fid *)); int fdesc_mount(mp, path, data, ndp, p) struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c index 62a3225db50..639e0059001 100644 --- a/sys/miscfs/kernfs/kernfs_vfsops.c +++ b/sys/miscfs/kernfs/kernfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kernfs_vfsops.c,v 1.8 1997/11/06 05:58:35 csapuntz Exp $ */ +/* $OpenBSD: kernfs_vfsops.c,v 1.9 1998/02/08 22:41:38 tholo Exp $ */ /* $NetBSD: kernfs_vfsops.c,v 1.26 1996/04/22 01:42:27 christos Exp $ */ /* @@ -61,7 +61,7 @@ dev_t rrootdev = NODEV; int kernfs_init __P((struct vfsconf *)); void kernfs_get_rrootdev __P((void)); -int kernfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, +int kernfs_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int kernfs_start __P((struct mount *, int, struct proc *)); int kernfs_unmount __P((struct mount *, int, struct proc *)); @@ -105,7 +105,7 @@ kernfs_get_rrootdev() int kernfs_mount(mp, path, data, ndp, p) struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c index 9b9c3459cab..6b852d03915 100644 --- a/sys/miscfs/nullfs/null_vfsops.c +++ b/sys/miscfs/nullfs/null_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: null_vfsops.c,v 1.7 1997/11/06 05:58:40 csapuntz Exp $ */ +/* $OpenBSD: null_vfsops.c,v 1.8 1998/02/08 22:41:38 tholo Exp $ */ /* $NetBSD: null_vfsops.c,v 1.11 1996/05/10 22:50:56 jtk Exp $ */ /* @@ -57,7 +57,7 @@ #include <sys/malloc.h> #include <miscfs/nullfs/null.h> -int nullfs_mount __P((struct mount *, char *, caddr_t, +int nullfs_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int nullfs_start __P((struct mount *, int, struct proc *)); int nullfs_unmount __P((struct mount *, int, struct proc *)); @@ -76,7 +76,7 @@ int nullfs_vptofh __P((struct vnode *, struct fid *)); int nullfs_mount(mp, path, data, ndp, p) struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c index b883d8dc06d..5e6cb876637 100644 --- a/sys/miscfs/portal/portal_vfsops.c +++ b/sys/miscfs/portal/portal_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: portal_vfsops.c,v 1.5 1997/11/06 05:58:41 csapuntz Exp $ */ +/* $OpenBSD: portal_vfsops.c,v 1.6 1998/02/08 22:41:39 tholo Exp $ */ /* $NetBSD: portal_vfsops.c,v 1.14 1996/02/09 22:40:41 christos Exp $ */ /* @@ -65,7 +65,7 @@ #define portal_init ((int (*) __P((struct vfsconf *)))nullop) -int portal_mount __P((struct mount *, char *, caddr_t, +int portal_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int portal_start __P((struct mount *, int, struct proc *)); int portal_unmount __P((struct mount *, int, struct proc *)); @@ -79,7 +79,7 @@ int portal_statfs __P((struct mount *, struct statfs *, struct proc *)); int portal_mount(mp, path, data, ndp, p) struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c index 297323b8d94..c9bbc2751d8 100644 --- a/sys/miscfs/procfs/procfs_vfsops.c +++ b/sys/miscfs/procfs/procfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: procfs_vfsops.c,v 1.7 1997/11/06 05:58:43 csapuntz Exp $ */ +/* $OpenBSD: procfs_vfsops.c,v 1.8 1998/02/08 22:41:40 tholo Exp $ */ /* $NetBSD: procfs_vfsops.c,v 1.25 1996/02/09 22:40:53 christos Exp $ */ /* @@ -57,7 +57,7 @@ #include <miscfs/procfs/procfs.h> #include <vm/vm.h> /* for PAGE_SIZE */ -int procfs_mount __P((struct mount *, char *, caddr_t, +int procfs_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int procfs_start __P((struct mount *, int, struct proc *)); int procfs_unmount __P((struct mount *, int, struct proc *)); @@ -71,7 +71,7 @@ int procfs_statfs __P((struct mount *, struct statfs *, struct proc *)); int procfs_mount(mp, path, data, ndp, p) struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c index 67cf09a0a70..584e27e0e3c 100644 --- a/sys/miscfs/umapfs/umap_vfsops.c +++ b/sys/miscfs/umapfs/umap_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umap_vfsops.c,v 1.11 1997/11/06 05:58:48 csapuntz Exp $ */ +/* $OpenBSD: umap_vfsops.c,v 1.12 1998/02/08 22:41:41 tholo Exp $ */ /* $NetBSD: umap_vfsops.c,v 1.9 1996/02/09 22:41:05 christos Exp $ */ /* @@ -56,7 +56,7 @@ #include <sys/malloc.h> #include <miscfs/umapfs/umap.h> -int umapfs_mount __P((struct mount *, char *, caddr_t, +int umapfs_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int umapfs_start __P((struct mount *, int, struct proc *)); int umapfs_unmount __P((struct mount *, int, struct proc *)); @@ -76,7 +76,7 @@ int umapfs_vptofh __P((struct vnode *, struct fid *)); int umapfs_mount(mp, path, data, ndp, p) struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c index c92d96be7cd..8032397c2d0 100644 --- a/sys/miscfs/union/union_vfsops.c +++ b/sys/miscfs/union/union_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: union_vfsops.c,v 1.7 1997/11/06 05:58:52 csapuntz Exp $ */ +/* $OpenBSD: union_vfsops.c,v 1.8 1998/02/08 22:41:42 tholo Exp $ */ /* $NetBSD: union_vfsops.c,v 1.10 1995/06/18 14:47:47 cgd Exp $ */ /* @@ -59,7 +59,7 @@ #include <miscfs/union/union.h> -int union_mount __P((struct mount *, char *, caddr_t, struct nameidata *, +int union_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int union_start __P((struct mount *, int, struct proc *)); int union_unmount __P((struct mount *, int, struct proc *)); @@ -72,7 +72,7 @@ int union_statfs __P((struct mount *, struct statfs *, struct proc *)); int union_mount(mp, path, data, ndp, p) struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c index d8107dac9be..21a1c5c6b59 100644 --- a/sys/msdosfs/msdosfs_vfsops.c +++ b/sys/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vfsops.c,v 1.13 1998/01/11 20:39:10 provos Exp $ */ +/* $OpenBSD: msdosfs_vfsops.c,v 1.14 1998/02/08 22:41:44 tholo Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $ */ /*- @@ -70,7 +70,7 @@ #include <msdosfs/msdosfsmount.h> #include <msdosfs/fat.h> -int msdosfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, +int msdosfs_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int msdosfs_start __P((struct mount *, int, struct proc *)); int msdosfs_unmount __P((struct mount *, int, struct proc *)); @@ -92,7 +92,7 @@ int msdosfs_mountfs __P((struct vnode *, struct mount *, struct proc *, int msdosfs_mount(mp, path, data, ndp, p) struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/msdosfs/msdosfsmount.h b/sys/msdosfs/msdosfsmount.h index 069b5a13c3b..949e972b199 100644 --- a/sys/msdosfs/msdosfsmount.h +++ b/sys/msdosfs/msdosfsmount.h @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfsmount.h,v 1.9 1998/01/11 20:39:11 provos Exp $ */ +/* $OpenBSD: msdosfsmount.h,v 1.10 1998/02/08 22:41:44 tholo Exp $ */ /* $NetBSD: msdosfsmount.h,v 1.16 1997/10/17 11:24:24 ws Exp $ */ /*- @@ -198,7 +198,7 @@ struct msdosfsmount { /* * Prototypes for MSDOSFS virtual filesystem operations */ -int msdosfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, struct proc *)); +int msdosfs_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int msdosfs_start __P((struct mount *, int, struct proc *)); int msdosfs_unmount __P((struct mount *, int, struct proc *)); int msdosfs_root __P((struct mount *, struct vnode **)); diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index 7f8e0201ced..ecc18ab19ba 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vfsops.c,v 1.23 1997/11/11 11:20:32 niklas Exp $ */ +/* $OpenBSD: nfs_vfsops.c,v 1.24 1998/02/08 22:41:45 tholo Exp $ */ /* $NetBSD: nfs_vfsops.c,v 1.46.4.1 1996/05/25 22:40:35 fvdl Exp $ */ /* @@ -576,7 +576,7 @@ nfs_decode_args(nmp, argp) int nfs_mount(mp, path, data, ndp, p) struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h index 290f83736b4..d588df1718e 100644 --- a/sys/nfs/nfsmount.h +++ b/sys/nfs/nfsmount.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsmount.h,v 1.4 1996/12/17 03:46:39 dm Exp $ */ +/* $OpenBSD: nfsmount.h,v 1.5 1998/02/08 22:41:46 tholo Exp $ */ /* $NetBSD: nfsmount.h,v 1.10 1996/02/18 11:54:03 fvdl Exp $ */ /* @@ -101,7 +101,7 @@ struct nfsmount { /* * Prototypes for NFS mount operations */ -int nfs_mount __P((struct mount *mp, char *path, caddr_t data, +int nfs_mount __P((struct mount *mp, const char *path, caddr_t data, struct nameidata *ndp, struct proc *p)); int mountnfs __P((struct nfs_args *argp, struct mount *mp, struct mbuf *nam, char *pth, char *hst, struct vnode **vpp)); diff --git a/sys/sys/mount.h b/sys/sys/mount.h index e91a2c41aa5..e2e7f650cec 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.h,v 1.21 1997/11/06 05:59:09 csapuntz Exp $ */ +/* $OpenBSD: mount.h,v 1.22 1998/02/08 22:41:47 tholo Exp $ */ /* $NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $ */ /* @@ -231,7 +231,7 @@ extern int maxvfsconf; /* highest defined filesystem type */ extern struct vfsconf *vfsconf; /* head of list of filesystem types */ struct vfsops { - int (*vfs_mount) __P((struct mount *mp, char *path, caddr_t data, + int (*vfs_mount) __P((struct mount *mp, const char *path, caddr_t data, struct nameidata *ndp, struct proc *p)); int (*vfs_start) __P((struct mount *mp, int flags, struct proc *p)); diff --git a/sys/sys/time.h b/sys/sys/time.h index bf571066ba2..d2a4548639c 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -1,4 +1,4 @@ -/* $OpenBSD: time.h,v 1.6 1997/04/25 03:55:20 tholo Exp $ */ +/* $OpenBSD: time.h,v 1.7 1998/02/08 22:41:47 tholo Exp $ */ /* $NetBSD: time.h,v 1.18 1996/04/23 10:29:33 mycroft Exp $ */ /* @@ -177,7 +177,7 @@ int adjtime __P((const struct timeval *, struct timeval *)); int futimes __P((int, const struct timeval *)); int getitimer __P((int, struct itimerval *)); int gettimeofday __P((struct timeval *, struct timezone *)); -int nanosleep __P((struct timespec *, struct timespec *)); +int nanosleep __P((const struct timespec *, struct timespec *)); int setitimer __P((int, const struct itimerval *, struct itimerval *)); int settimeofday __P((const struct timeval *, const struct timezone *)); int utimes __P((const char *, const struct timeval *)); diff --git a/sys/ufs/ext2fs/ext2fs_extern.h b/sys/ufs/ext2fs/ext2fs_extern.h index c9bda4fd007..2d56d80ceb0 100644 --- a/sys/ufs/ext2fs/ext2fs_extern.h +++ b/sys/ufs/ext2fs/ext2fs_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_extern.h,v 1.4 1997/11/06 05:59:14 csapuntz Exp $ */ +/* $OpenBSD: ext2fs_extern.h,v 1.5 1998/02/08 22:41:48 tholo Exp $ */ /* $NetBSD: ext2fs_extern.h,v 1.1 1997/06/11 09:33:55 bouyer Exp $ */ /*- @@ -101,8 +101,8 @@ void ext2fs_checkoverlap __P((struct buf *, struct inode *)); /* ext2fs_vfsops.c */ int ext2fs_mountroot __P((void)); -int ext2fs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, - struct proc *)); +int ext2fs_mount __P((struct mount *, const char *, caddr_t, + struct nameidata *, struct proc *)); int ext2fs_reload __P((struct mount *, struct ucred *, struct proc *)); int ext2fs_mountfs __P((struct vnode *, struct mount *, struct proc *)); int ext2fs_unmount __P((struct mount *, int, struct proc *)); diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c index 2a6efb270c1..da9a7612165 100644 --- a/sys/ufs/ext2fs/ext2fs_vfsops.c +++ b/sys/ufs/ext2fs/ext2fs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vfsops.c,v 1.8 1998/01/09 20:41:54 csapuntz Exp $ */ +/* $OpenBSD: ext2fs_vfsops.c,v 1.9 1998/02/08 22:41:48 tholo Exp $ */ /* $NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $ */ /* @@ -185,7 +185,7 @@ ext2fs_mountroot() int ext2fs_mount(mp, path, data, ndp, p) register struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index 9e1fac15d10..d955a10e74a 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_extern.h,v 1.6 1997/11/09 19:54:34 millert Exp $ */ +/* $OpenBSD: ffs_extern.h,v 1.7 1998/02/08 22:41:49 tholo Exp $ */ /* $NetBSD: ffs_extern.h,v 1.4 1996/02/09 22:22:22 christos Exp $ */ /*- @@ -105,7 +105,7 @@ void ffs_setblock __P((struct fs *, unsigned char *, daddr_t)); /* ffs_vfsops.c */ int ffs_mountroot __P((void)); -int ffs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, +int ffs_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int ffs_reload __P((struct mount *, struct ucred *, struct proc *)); int ffs_mountfs __P((struct vnode *, struct mount *, struct proc *)); diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index e0602ba4ac1..01def1c3f58 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.16 1998/01/17 18:20:54 mickey Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.17 1998/02/08 22:41:50 tholo Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -137,7 +137,7 @@ ffs_mountroot() int ffs_mount(mp, path, data, ndp, p) register struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h index 0cfd6467838..2c03f07c3eb 100644 --- a/sys/ufs/lfs/lfs_extern.h +++ b/sys/ufs/lfs/lfs_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs_extern.h,v 1.3 1996/07/01 07:41:51 downsj Exp $ */ +/* $OpenBSD: lfs_extern.h,v 1.4 1998/02/08 22:41:51 tholo Exp $ */ /* $NetBSD: lfs_extern.h,v 1.5 1996/02/12 15:20:12 christos Exp $ */ /*- @@ -113,7 +113,7 @@ struct buf *lfs_fakebuf __P((struct vnode *, int, size_t, caddr_t)); /* lfs_vfsops.c */ int lfs_mountroot __P((void)); -int lfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, struct proc *)); +int lfs_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int lfs_mountfs __P((struct vnode *, struct mount *, struct proc *)); int lfs_unmount __P((struct mount *, int, struct proc *)); int lfs_statfs __P((struct mount *, struct statfs *, struct proc *)); diff --git a/sys/ufs/mfs/mfs_extern.h b/sys/ufs/mfs/mfs_extern.h index bc463041a33..a2c7840b1aa 100644 --- a/sys/ufs/mfs/mfs_extern.h +++ b/sys/ufs/mfs/mfs_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mfs_extern.h,v 1.5 1997/11/06 05:59:23 csapuntz Exp $ */ +/* $OpenBSD: mfs_extern.h,v 1.6 1998/02/08 22:41:52 tholo Exp $ */ /* $NetBSD: mfs_extern.h,v 1.4 1996/02/09 22:31:27 christos Exp $ */ /*- @@ -49,7 +49,7 @@ __BEGIN_DECLS /* mfs_vfsops.c */ int mfs_mountroot __P((void)); int mfs_initminiroot __P((caddr_t)); -int mfs_mount __P((struct mount *, char *, caddr_t, +int mfs_mount __P((struct mount *, const char *, caddr_t, struct nameidata *, struct proc *)); int mfs_start __P((struct mount *, int, struct proc *)); int mfs_statfs __P((struct mount *, struct statfs *, struct proc *)); diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index 1a9948d60bf..7361f846c4c 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfs_vfsops.c,v 1.5 1997/11/06 05:59:23 csapuntz Exp $ */ +/* $OpenBSD: mfs_vfsops.c,v 1.6 1998/02/08 22:41:52 tholo Exp $ */ /* $NetBSD: mfs_vfsops.c,v 1.10 1996/02/09 22:31:28 christos Exp $ */ /* @@ -164,7 +164,7 @@ mfs_initminiroot(base) int mfs_mount(mp, path, data, ndp, p) register struct mount *mp; - char *path; + const char *path; caddr_t data; struct nameidata *ndp; struct proc *p; |