summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1995-03-09 12:05:21 +0000
committermycroft <mycroft@NetBSD.org>1995-03-09 12:05:21 +0000
commit2f805fa51b58922cecaccfd240c0180b7eb6468a (patch)
tree0ba7838b7d0929460d9f5719d9689f6cd3d81665 /sys
parentd004d5d34c558fa4d71cea0d61dfa1c3933cbf3b (diff)
copy*str() should use size_t.
Diffstat (limited to 'sys')
-rw-r--r--sys/adosfs/advfsops.c4
-rw-r--r--sys/arch/alpha/alpha/locore.s4
-rw-r--r--sys/arch/amiga/amiga/Locore.c12
-rw-r--r--sys/arch/hp300/hp300/Locore.c12
-rw-r--r--sys/arch/mips/mips/locore.S14
-rw-r--r--sys/arch/mips/mips/locore_r2000.S14
-rw-r--r--sys/arch/mips/mips/locore_r4000.S14
-rw-r--r--sys/arch/pc532/pc532/machdep.c8
-rw-r--r--sys/arch/pmax/pmax/locore.S14
-rw-r--r--sys/arch/vax/vax/vm_machdep.c6
-rw-r--r--sys/compat/sunos/sunos_misc.c4
-rw-r--r--sys/compat/ultrix/ultrix_misc.c5
-rw-r--r--sys/isofs/cd9660/cd9660_vfsops.c6
-rw-r--r--sys/kern/exec_script.c5
-rw-r--r--sys/kern/kern_exec.c4
-rw-r--r--sys/kern/kern_lkm.c9
-rw-r--r--sys/kern/kern_prot.c4
-rw-r--r--sys/kern/vfs_syscalls.c4
-rw-r--r--sys/miscfs/fdesc/fdesc_vfsops.c4
-rw-r--r--sys/miscfs/kernfs/kernfs_vfsops.c4
-rw-r--r--sys/miscfs/nullfs/null_vfsops.c4
-rw-r--r--sys/miscfs/portal/portal_vfsops.c4
-rw-r--r--sys/miscfs/procfs/procfs_vfsops.c4
-rw-r--r--sys/miscfs/umapfs/umap_vfsops.c4
-rw-r--r--sys/miscfs/union/union_vfsops.c4
-rw-r--r--sys/msdosfs/msdosfs_vfsops.c4
-rw-r--r--sys/nfs/nfs_vfsops.c4
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c6
-rw-r--r--sys/ufs/lfs/lfs_vfsops.c4
-rw-r--r--sys/ufs/mfs/mfs_vfsops.c6
30 files changed, 99 insertions, 96 deletions
diff --git a/sys/adosfs/advfsops.c b/sys/adosfs/advfsops.c
index 70040b1498d..92f882a0dd2 100644
--- a/sys/adosfs/advfsops.c
+++ b/sys/adosfs/advfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.11 1995/03/08 01:26:41 cgd Exp $ */
+/* $NetBSD: advfsops.c,v 1.12 1995/03/09 12:06:20 mycroft Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -56,7 +56,7 @@ adosfs_mount(mp, path, data, ndp, p)
struct vnode *devvp;
struct adosfs_args args;
struct adosfsmount *amp;
- u_long size;
+ size_t size;
int error;
mode_t accessmode;
diff --git a/sys/arch/alpha/alpha/locore.s b/sys/arch/alpha/alpha/locore.s
index ddb53975fcc..417d8401d27 100644
--- a/sys/arch/alpha/alpha/locore.s
+++ b/sys/arch/alpha/alpha/locore.s
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.1 1995/02/13 23:07:00 cgd Exp $ */
+/* $NetBSD: locore.s,v 1.2 1995/03/09 12:05:34 mycroft Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -995,7 +995,7 @@ LEAF(switch_exit, 1)
* Copy a null-terminated string within the kernel's address space.
* If lenp is not NULL, store the number of chars copied in *lenp
*
- * int copystr(char *from, char *to, u_int len, u_int *lenp);
+ * int copystr(char *from, char *to, size_t len, size_t *lenp);
*/
LEAF(copystr, 4)
SETGP(pv)
diff --git a/sys/arch/amiga/amiga/Locore.c b/sys/arch/amiga/amiga/Locore.c
index b6957bc89ad..a6184c854bf 100644
--- a/sys/arch/amiga/amiga/Locore.c
+++ b/sys/arch/amiga/amiga/Locore.c
@@ -1,4 +1,4 @@
-/* $NetBSD: Locore.c,v 1.8 1994/10/26 02:01:28 cgd Exp $ */
+/* $NetBSD: Locore.c,v 1.9 1995/03/09 12:05:21 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -202,19 +202,19 @@ struct ste Sysseg[NPTEPG];
/*ARGSUSED*/
ovbcopy(from, to, len) caddr_t from, to; unsigned len; { }
copyinstr(udaddr, kaddr, maxlength, lencopied)
- caddr_t udaddr, kaddr; u_int maxlength, *lencopied;
+ caddr_t udaddr, kaddr; size_t maxlength, *lencopied;
{ *kaddr = *udaddr; *lencopied = maxlength; return (0); }
copyoutstr(kaddr, udaddr, maxlength, lencopied)
- caddr_t kaddr, udaddr; u_int maxlength, *lencopied;
+ caddr_t kaddr, udaddr; size_t maxlength, *lencopied;
{ *udaddr = *kaddr; *lencopied = maxlength; return (0); }
copystr(kfaddr, kdaddr, maxlength, lencopied)
- caddr_t kfaddr, kdaddr; u_int maxlength, *lencopied;
+ caddr_t kfaddr, kdaddr; size_t maxlength, *lencopied;
{ *kdaddr = *kfaddr; *lencopied = maxlength; return (0); }
/*ARGSUSED*/
-copyin(udaddr, kaddr, n) caddr_t udaddr, kaddr; u_int n; { return (0); }
+copyin(udaddr, kaddr, n) caddr_t udaddr, kaddr; size_t n; { return (0); }
/*ARGSUSED*/
-copyout(kaddr, udaddr, n) caddr_t kaddr, udaddr; u_int n; { return (0); }
+copyout(kaddr, udaddr, n) caddr_t kaddr, udaddr; size_t n; { return (0); }
/*ARGSUSED*/
longjmp(lp) label_t *lp; { /*NOTREACHED*/ }
diff --git a/sys/arch/hp300/hp300/Locore.c b/sys/arch/hp300/hp300/Locore.c
index 3031d3bfd70..43bbaf85bd0 100644
--- a/sys/arch/hp300/hp300/Locore.c
+++ b/sys/arch/hp300/hp300/Locore.c
@@ -1,4 +1,4 @@
-/* $NetBSD: Locore.c,v 1.7 1995/02/08 14:52:31 mycroft Exp $ */
+/* $NetBSD: Locore.c,v 1.8 1995/03/09 12:05:24 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -202,19 +202,19 @@ struct ste Sysseg[NPTEPG];
/*ARGSUSED*/
ovbcopy(from, to, len) caddr_t from, to; unsigned len; { }
copyinstr(udaddr, kaddr, maxlength, lencopied)
- caddr_t udaddr, kaddr; u_int maxlength, *lencopied;
+ caddr_t udaddr, kaddr; size_t maxlength, *lencopied;
{ *kaddr = *udaddr; *lencopied = maxlength; return (0); }
copyoutstr(kaddr, udaddr, maxlength, lencopied)
- caddr_t kaddr, udaddr; u_int maxlength, *lencopied;
+ caddr_t kaddr, udaddr; size_t maxlength, *lencopied;
{ *udaddr = *kaddr; *lencopied = maxlength; return (0); }
copystr(kfaddr, kdaddr, maxlength, lencopied)
- caddr_t kfaddr, kdaddr; u_int maxlength, *lencopied;
+ caddr_t kfaddr, kdaddr; size_t maxlength, *lencopied;
{ *kdaddr = *kfaddr; *lencopied = maxlength; return (0); }
/*ARGSUSED*/
-copyin(udaddr, kaddr, n) caddr_t udaddr, kaddr; u_int n; { return (0); }
+copyin(udaddr, kaddr, n) caddr_t udaddr, kaddr; size_t n; { return (0); }
/*ARGSUSED*/
-copyout(kaddr, udaddr, n) caddr_t kaddr, udaddr; u_int n; { return (0); }
+copyout(kaddr, udaddr, n) caddr_t kaddr, udaddr; size_t n; { return (0); }
/*ARGSUSED*/
longjmp(lp) label_t *lp; { /*NOTREACHED*/ }
diff --git a/sys/arch/mips/mips/locore.S b/sys/arch/mips/mips/locore.S
index 552be53b979..98c546e9911 100644
--- a/sys/arch/mips/mips/locore.S
+++ b/sys/arch/mips/mips/locore.S
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.9 1995/01/18 06:45:29 mellon Exp $ */
+/* $NetBSD: locore.S,v 1.10 1995/03/09 12:05:29 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -522,8 +522,8 @@ END(memcpy)
* copystr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
LEAF(copystr)
move t2, a2 # Save the number of bytes
@@ -551,8 +551,8 @@ END(copystr)
* copyinstr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
NON_LEAF(copyinstr, STAND_FRAME_SIZE, ra)
subu sp, sp, STAND_FRAME_SIZE
@@ -576,8 +576,8 @@ END(copyinstr)
* copyoutstr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
NON_LEAF(copyoutstr, STAND_FRAME_SIZE, ra)
subu sp, sp, STAND_FRAME_SIZE
diff --git a/sys/arch/mips/mips/locore_r2000.S b/sys/arch/mips/mips/locore_r2000.S
index ab21d0e6986..18439215b15 100644
--- a/sys/arch/mips/mips/locore_r2000.S
+++ b/sys/arch/mips/mips/locore_r2000.S
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_r2000.S,v 1.9 1995/01/18 06:45:29 mellon Exp $ */
+/* $NetBSD: locore_r2000.S,v 1.10 1995/03/09 12:05:29 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -522,8 +522,8 @@ END(memcpy)
* copystr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
LEAF(copystr)
move t2, a2 # Save the number of bytes
@@ -551,8 +551,8 @@ END(copystr)
* copyinstr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
NON_LEAF(copyinstr, STAND_FRAME_SIZE, ra)
subu sp, sp, STAND_FRAME_SIZE
@@ -576,8 +576,8 @@ END(copyinstr)
* copyoutstr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
NON_LEAF(copyoutstr, STAND_FRAME_SIZE, ra)
subu sp, sp, STAND_FRAME_SIZE
diff --git a/sys/arch/mips/mips/locore_r4000.S b/sys/arch/mips/mips/locore_r4000.S
index e86322db28c..986ed5ca324 100644
--- a/sys/arch/mips/mips/locore_r4000.S
+++ b/sys/arch/mips/mips/locore_r4000.S
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_r4000.S,v 1.9 1995/01/18 06:45:29 mellon Exp $ */
+/* $NetBSD: locore_r4000.S,v 1.10 1995/03/09 12:05:29 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -522,8 +522,8 @@ END(memcpy)
* copystr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
LEAF(copystr)
move t2, a2 # Save the number of bytes
@@ -551,8 +551,8 @@ END(copystr)
* copyinstr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
NON_LEAF(copyinstr, STAND_FRAME_SIZE, ra)
subu sp, sp, STAND_FRAME_SIZE
@@ -576,8 +576,8 @@ END(copyinstr)
* copyoutstr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
NON_LEAF(copyoutstr, STAND_FRAME_SIZE, ra)
subu sp, sp, STAND_FRAME_SIZE
diff --git a/sys/arch/pc532/pc532/machdep.c b/sys/arch/pc532/pc532/machdep.c
index 363b7c6947f..a5749d12810 100644
--- a/sys/arch/pc532/pc532/machdep.c
+++ b/sys/arch/pc532/pc532/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.29 1995/01/18 08:14:33 phil Exp $ */
+/* $NetBSD: machdep.c,v 1.30 1995/03/09 12:05:26 mycroft Exp $ */
/*-
* Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
@@ -919,7 +919,7 @@ vmunaccess() {printf ("vmunaccess!\n");}
/*
* Below written in C to allow access to debugging code
*/
-copyinstr(fromaddr, toaddr, maxlength, lencopied) u_int *lencopied, maxlength;
+copyinstr(fromaddr, toaddr, maxlength, lencopied) size_t *lencopied, maxlength;
void *toaddr, *fromaddr; {
int c,tally;
@@ -941,7 +941,7 @@ copyinstr(fromaddr, toaddr, maxlength, lencopied) u_int *lencopied, maxlength;
return(ENAMETOOLONG);
}
-copyoutstr(fromaddr, toaddr, maxlength, lencopied) u_int *lencopied, maxlength;
+copyoutstr(fromaddr, toaddr, maxlength, lencopied) size_t *lencopied, maxlength;
void *fromaddr, *toaddr; {
int c;
int tally;
@@ -960,7 +960,7 @@ copyoutstr(fromaddr, toaddr, maxlength, lencopied) u_int *lencopied, maxlength;
return(ENAMETOOLONG);
}
-copystr(fromaddr, toaddr, maxlength, lencopied) u_int *lencopied, maxlength;
+copystr(fromaddr, toaddr, maxlength, lencopied) size_t *lencopied, maxlength;
void *fromaddr, *toaddr; {
u_int tally;
diff --git a/sys/arch/pmax/pmax/locore.S b/sys/arch/pmax/pmax/locore.S
index 552be53b979..98c546e9911 100644
--- a/sys/arch/pmax/pmax/locore.S
+++ b/sys/arch/pmax/pmax/locore.S
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.9 1995/01/18 06:45:29 mellon Exp $ */
+/* $NetBSD: locore.S,v 1.10 1995/03/09 12:05:29 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -522,8 +522,8 @@ END(memcpy)
* copystr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
LEAF(copystr)
move t2, a2 # Save the number of bytes
@@ -551,8 +551,8 @@ END(copystr)
* copyinstr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
NON_LEAF(copyinstr, STAND_FRAME_SIZE, ra)
subu sp, sp, STAND_FRAME_SIZE
@@ -576,8 +576,8 @@ END(copyinstr)
* copyoutstr(fromaddr, toaddr, maxlength, &lencopied)
* caddr_t fromaddr;
* caddr_t toaddr;
- * u_int maxlength;
- * u_int *lencopied;
+ * size_t maxlength;
+ * size_t *lencopied;
*/
NON_LEAF(copyoutstr, STAND_FRAME_SIZE, ra)
subu sp, sp, STAND_FRAME_SIZE
diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c
index a49580704f8..bc62933b648 100644
--- a/sys/arch/vax/vax/vm_machdep.c
+++ b/sys/arch/vax/vax/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.8 1995/03/08 00:50:13 cgd Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.9 1995/03/09 12:05:32 mycroft Exp $ */
#undef SWDEBUG
/*
@@ -239,7 +239,7 @@ idle:
/* Should check that values is in bounds XXX */
copyinstr(from, to, maxlen, lencopied)
void *from, *to;
-u_int *lencopied,maxlen;
+size_t *lencopied,maxlen;
{
u_int i;
char *gfrom=from, *gto=to;
@@ -257,7 +257,7 @@ ok:
/* Should check that values is in bounds XXX */
copyoutstr(from, to, maxlen, lencopied)
void *from, *to;
-u_int *lencopied,maxlen;
+size_t *lencopied,maxlen;
{
u_int i;
char *gfrom=from, *gto=to;
diff --git a/sys/compat/sunos/sunos_misc.c b/sys/compat/sunos/sunos_misc.c
index 9d81f39d9f8..03732979ccb 100644
--- a/sys/compat/sunos/sunos_misc.c
+++ b/sys/compat/sunos/sunos_misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_misc.c,v 1.41 1994/12/17 19:22:16 mycroft Exp $ */
+/* $NetBSD: sunos_misc.c,v 1.42 1995/03/09 12:06:14 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -183,7 +183,7 @@ sunos_mount(p, uap, retval)
SCARG(uap, flags) = nflags;
if (error = copyinstr((caddr_t)SCARG(uap, type), fsname,
- sizeof fsname, (u_int *)0))
+ sizeof fsname, (size_t *)0))
return (error);
if (strcmp(fsname, "4.2") == 0) {
diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c
index 92da0660c6f..9a1f0164713 100644
--- a/sys/compat/ultrix/ultrix_misc.c
+++ b/sys/compat/ultrix/ultrix_misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_misc.c,v 1.9 1995/01/18 06:56:34 mellon Exp $ */
+/* $NetBSD: ultrix_misc.c,v 1.10 1995/03/09 12:06:17 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -316,7 +316,8 @@ sun_mount(p, uap, retval)
nflags |= MNT_UPDATE;
uap->flags = nflags;
- if (error = copyinstr((caddr_t)uap->type, fsname, sizeof fsname, (u_int *)0))
+ if (error = copyinstr((caddr_t)uap->type, fsname, sizeof fsname,
+ (size_t *)0))
return (error);
if (strcmp(fsname, "4.2") == 0) {
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index fb86874511f..02a2c32180f 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_vfsops.c,v 1.17 1995/03/08 01:33:20 cgd Exp $ */
+/* $NetBSD: cd9660_vfsops.c,v 1.18 1995/03/09 12:05:36 mycroft Exp $ */
/*-
* Copyright (c) 1994
@@ -95,7 +95,7 @@ cd9660_mountroot()
struct proc *p = curproc; /* XXX */
struct iso_mnt *imp;
register struct fs *fs;
- u_long size;
+ size_t size;
int error;
struct iso_args args;
@@ -149,7 +149,7 @@ cd9660_mount(mp, path, data, ndp, p)
{
struct vnode *devvp;
struct iso_args args;
- u_long size;
+ size_t size;
int error;
struct iso_mnt *imp;
diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c
index 7c23177935e..d414a23aa49 100644
--- a/sys/kern/exec_script.c
+++ b/sys/kern/exec_script.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_script.c,v 1.10 1994/12/04 03:10:40 mycroft Exp $ */
+/* $NetBSD: exec_script.c,v 1.11 1995/03/09 12:05:47 mycroft Exp $ */
/*
* Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -202,7 +202,8 @@ check_shell:
if ((epp->ep_flags & EXEC_HASFD) == 0) {
#endif
/* normally can't fail, but check for it if diagnostic */
- error = copyinstr(epp->ep_name, *tmpsap++, MAXPATHLEN, 0);
+ error = copyinstr(epp->ep_name, *tmpsap++, MAXPATHLEN,
+ (size_t *)0);
#ifdef DIAGNOSTIC
if (error != 0)
panic("exec_script: copyinstr couldn't fail\n");
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index fdf438d372b..411275e8034 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.63 1995/03/08 01:23:00 cgd Exp $ */
+/* $NetBSD: kern_exec.c,v 1.64 1995/03/09 12:05:39 mycroft Exp $ */
/*-
* Copyright (C) 1993, 1994 Christopher G. Demetriou
@@ -218,7 +218,7 @@ execve(p, uap, retval)
char *argp;
char **cpp, *dp, *sp, *np;
long argc, envc;
- u_long len;
+ size_t len;
char *stack;
struct ps_strings arginfo;
struct vmspace *vm = p->p_vmspace;
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 04e7b2cdada..fabf6859e90 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lkm.c,v 1.22 1994/12/24 13:25:48 cgd Exp $ */
+/* $NetBSD: kern_lkm.c,v 1.23 1995/03/09 12:05:41 mycroft Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -321,7 +321,8 @@ lkmioctl(dev, cmd, data, flag)
* Copy name and lookup id from all loaded
* modules. May fail.
*/
- if (err = copyinstr(unloadp->name, istr, MAXLKMNAME-1, NULL))
+ if (err = copyinstr(unloadp->name, istr, MAXLKMNAME-1,
+ (size_t *)0))
break;
/*
@@ -372,7 +373,7 @@ lkmioctl(dev, cmd, data, flag)
* Copy name and lookup id from all loaded
* modules.
*/
- copystr(statp->name, istr, MAXLKMNAME-1, NULL);
+ copystr(statp->name, istr, MAXLKMNAME-1, (size_t *)0);
/*
* look up id...
*/
@@ -418,7 +419,7 @@ lkmioctl(dev, cmd, data, flag)
copystr(curp->private.lkm_any->lkm_name,
statp->name,
MAXLKMNAME - 2,
- NULL);
+ (size_t *)0);
break;
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 1096bd3d3b8..6e216beb369 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_prot.c,v 1.24 1995/03/08 01:21:30 cgd Exp $ */
+/* $NetBSD: kern_prot.c,v 1.25 1995/03/09 12:05:43 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1991, 1993
@@ -588,7 +588,7 @@ setlogin(p, uap, retval)
return (error);
error = copyinstr((caddr_t) SCARG(uap, namebuf),
(caddr_t) p->p_pgrp->pg_session->s_login,
- sizeof (p->p_pgrp->pg_session->s_login) - 1, NULL);
+ sizeof (p->p_pgrp->pg_session->s_login) - 1, (size_t *)0);
if (error == ENAMETOOLONG)
error = EINVAL;
return (error);
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 2708aa6953c..e0c6f4c81c9 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.50 1995/03/08 01:21:32 cgd Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.51 1995/03/09 12:05:45 mycroft Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -975,7 +975,7 @@ symlink(p, uap, retval)
struct nameidata nd;
MALLOC(path, char *, MAXPATHLEN, M_NAMEI, M_WAITOK);
- if (error = copyinstr(SCARG(uap, path), path, MAXPATHLEN, NULL))
+ if (error = copyinstr(SCARG(uap, path), path, MAXPATHLEN, (size_t *)0))
goto out;
NDINIT(&nd, CREATE, LOCKPARENT, UIO_USERSPACE, SCARG(uap, link), p);
if (error = namei(&nd))
diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c
index c62e8300ab6..485aab62fb5 100644
--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc_vfsops.c,v 1.18 1995/03/08 01:34:45 cgd Exp $ */
+/* $NetBSD: fdesc_vfsops.c,v 1.19 1995/03/09 12:05:50 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -69,7 +69,7 @@ fdesc_mount(mp, path, data, ndp, p)
struct proc *p;
{
int error = 0;
- u_long size;
+ size_t size;
struct fdescmount *fmp;
struct vnode *rvp;
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 69c79844ccc..82153fa5b63 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kernfs_vfsops.c,v 1.22 1995/03/08 01:34:48 cgd Exp $ */
+/* $NetBSD: kernfs_vfsops.c,v 1.23 1995/03/09 12:05:52 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -96,7 +96,7 @@ kernfs_mount(mp, path, data, ndp, p)
struct proc *p;
{
int error = 0;
- u_long size;
+ size_t size;
struct kernfs_mount *fmp;
struct vnode *rvp;
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index cb0d1271c3f..ec6ba80712f 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: null_vfsops.c,v 1.7 1995/03/08 01:34:50 cgd Exp $ */
+/* $NetBSD: null_vfsops.c,v 1.8 1995/03/09 12:05:56 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -71,7 +71,7 @@ nullfs_mount(mp, path, data, ndp, p)
struct vnode *lowerrootvp, *vp;
struct vnode *nullm_rootvp;
struct null_mount *xmp;
- u_long size;
+ size_t size;
#ifdef NULLFS_DIAGNOSTIC
printf("nullfs_mount(mp = %x)\n", mp);
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index 774359beba2..4aa2c4712fd 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: portal_vfsops.c,v 1.11 1995/03/08 01:34:52 cgd Exp $ */
+/* $NetBSD: portal_vfsops.c,v 1.12 1995/03/09 12:05:57 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -85,7 +85,7 @@ portal_mount(mp, path, data, ndp, p)
struct portalmount *fmp;
struct socket *so;
struct vnode *rvp;
- u_long size;
+ size_t size;
int error;
/*
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 0ee27776f0b..a0f4535d657 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vfsops.c,v 1.22 1995/01/18 09:34:31 mycroft Exp $ */
+/* $NetBSD: procfs_vfsops.c,v 1.23 1995/03/09 12:05:54 mycroft Exp $ */
/*
* Copyright (c) 1993 Jan-Simon Pendry
@@ -68,7 +68,7 @@ procfs_mount(mp, path, data, ndp, p)
struct nameidata *ndp;
struct proc *p;
{
- u_int size;
+ size_t size;
if (UIO_MX & (UIO_MX-1)) {
log(LOG_ERR, "procfs: invalid directory entry size");
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index 6ef7542cc31..6126643d43c 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umap_vfsops.c,v 1.6 1995/01/25 14:50:56 cgd Exp $ */
+/* $NetBSD: umap_vfsops.c,v 1.7 1995/03/09 12:05:59 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -69,7 +69,7 @@ umapfs_mount(mp, path, data, ndp, p)
struct vnode *lowerrootvp, *vp;
struct vnode *umapm_rootvp;
struct umap_mount *amp;
- u_int size;
+ size_t size;
int error;
#ifdef UMAPFS_DIAGNOSTIC
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index 80ab4648704..ef0c9877b4c 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: union_vfsops.c,v 1.8 1995/01/18 09:34:35 mycroft Exp $ */
+/* $NetBSD: union_vfsops.c,v 1.9 1995/03/09 12:06:01 mycroft Exp $ */
/*
* Copyright (c) 1994 The Regents of the University of California.
@@ -77,7 +77,7 @@ union_mount(mp, path, data, ndp, p)
struct vattr va;
char *cp;
int len;
- u_int size;
+ size_t size;
#ifdef UNION_DIAGNOSTIC
printf("union_mount(mp = %x)\n", mp);
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 23615f2602d..bcfabc6fa55 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.27 1995/03/08 01:49:37 cgd Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.28 1995/03/09 12:06:04 mycroft Exp $ */
/*-
* Copyright (C) 1994 Wolfgang Solfrank.
@@ -84,7 +84,7 @@ msdosfs_mount(mp, path, data, ndp, p)
struct vnode *devvp; /* vnode for blk device to mount */
struct msdosfs_args args; /* will hold data from mount request */
struct msdosfsmount *pmp; /* msdosfs specific mount control block */
- u_long size;
+ size_t size;
int error, flags;
mode_t accessmode;
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 2eb1480fd21..8a7815fa138 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vfsops.c,v 1.33 1995/01/18 06:15:19 mycroft Exp $ */
+/* $NetBSD: nfs_vfsops.c,v 1.34 1995/03/09 12:06:06 mycroft Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -435,7 +435,7 @@ nfs_mount(mp, path, data, ndp, p)
struct mbuf *nam;
struct vnode *vp;
char pth[MNAMELEN], hst[MNAMELEN];
- u_int len;
+ size_t len;
nfsv2fh_t nfh;
if (error = copyin(data, (caddr_t)&args, sizeof (struct nfs_args)))
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index f4263c4c074..22081650bf3 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.13 1995/03/08 01:51:49 cgd Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.14 1995/03/09 12:06:08 mycroft Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -94,7 +94,7 @@ ffs_mountroot()
register struct mount *mp;
struct proc *p = curproc; /* XXX */
struct ufsmount *ump;
- u_long size;
+ size_t size;
int error;
/*
@@ -149,7 +149,7 @@ ffs_mount(mp, path, data, ndp, p)
struct ufs_args args;
struct ufsmount *ump;
register struct fs *fs;
- u_long size;
+ size_t size;
int error, flags;
mode_t accessmode;
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index 6601648805e..957845c5423 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.7 1995/03/08 01:51:52 cgd Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.8 1995/03/09 12:06:10 mycroft Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -100,7 +100,7 @@ lfs_mount(mp, path, data, ndp, p)
struct ufs_args args;
struct ufsmount *ump;
register struct lfs *fs; /* LFS */
- u_long size;
+ size_t size;
int error;
mode_t accessmode;
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index 454b4bc580c..8a7bfae8dec 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfs_vfsops.c,v 1.6 1995/03/08 01:51:54 cgd Exp $ */
+/* $NetBSD: mfs_vfsops.c,v 1.7 1995/03/09 12:06:12 mycroft Exp $ */
/*
* Copyright (c) 1989, 1990, 1993, 1994
@@ -97,7 +97,7 @@ mfs_mountroot()
struct proc *p = curproc; /* XXX */
struct ufsmount *ump;
struct mfsnode *mfsp;
- u_long size;
+ size_t size;
int error;
/*
@@ -186,7 +186,7 @@ mfs_mount(mp, path, data, ndp, p)
struct ufsmount *ump;
register struct fs *fs;
register struct mfsnode *mfsp;
- u_long size;
+ size_t size;
int flags, error;
if (error = copyin(data, (caddr_t)&args, sizeof (struct mfs_args)))