32 bit ints are uint32_t, not u_long. works on 64bit now. ok deraadt@

1 files changed, 15 insertions, 15 deletions

diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 59bd652cdaa..ebf38bcac18 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.43 2003/11/13 17:19:40 drahn Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.44 2004/05/12 21:04:15 tedu Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $	*/
 
 /*-
@@ -264,8 +264,8 @@ msdosfs_getattr(v)
 	struct msdosfsmount *pmp = dep->de_pmp;
 	struct vattr *vap = ap->a_vap;
 	struct timespec ts;
-	u_long dirsperblk = pmp->pm_BytesPerSec / sizeof(struct direntry);
-	u_long fileid;
+	uint32_t dirsperblk = pmp->pm_BytesPerSec / sizeof(struct direntry);
+	uint32_t fileid;
 
 	TIMEVAL_TO_TIMESPEC(&time, &ts);
 	DETIMES(dep, &ts, &ts, &ts);
@@ -363,7 +363,7 @@ msdosfs_setattr(v)
 		return EISDIR;
 
 	if (vap->va_size != VNOVAL) {
-		error = detrunc(dep, (u_long)vap->va_size, 0, cred, ap->a_p);
+		error = detrunc(dep, (uint32_t)vap->va_size, 0, cred, ap->a_p);
 		if (error)
 			return (error);
 	}
@@ -449,7 +449,7 @@ msdosfs_read(v)
 	do {
 		lbn = de_cluster(pmp, uio->uio_offset);
 		on = uio->uio_offset & pmp->pm_crbomask;
-		n = min((u_long) (pmp->pm_bpcluster - on), uio->uio_resid);
+		n = min((uint32_t) (pmp->pm_bpcluster - on), uio->uio_resid);
 		diff = dep->de_FileSize - uio->uio_offset;
 		if (diff <= 0)
 			return (0);
@@ -509,9 +509,9 @@ msdosfs_write(v)
 	int n;
 	int croffset;
 	int resid;
-	u_long osize;
+	uint32_t osize;
 	int error = 0;
-	u_long count;
+	uint32_t count;
 	daddr_t bn, lastcn;
 	struct buf *bp;
 	int ioflag = ap->a_ioflag;
@@ -695,7 +695,7 @@ msdosfs_ioctl(v)
 #if 0
 	struct vop_ioctl_args /* {
 		struct vnode *a_vp;
-		u_long a_command;
+		uint32_t a_command;
 		caddr_t a_data;
 		int a_fflag;
 		struct ucred *a_cred;
@@ -870,11 +870,11 @@ msdosfs_rename(v)
 	struct proc *p = curproc; /* XXX */
 	register struct denode *ip, *xp, *dp, *zp;
 	u_char toname[11], oldname[11];
-	u_long from_diroffset, to_diroffset;
+	uint32_t from_diroffset, to_diroffset;
 	u_char to_count;
 	int doingdirectory = 0, newparent = 0;
 	int error;
-	u_long cn, pcl;
+	uint32_t cn, pcl;
 	daddr_t bn;
 	struct msdosfsmount *pmp;
 	struct direntry *dotdotp;
@@ -1206,7 +1206,7 @@ msdosfs_mkdir(v)
 	struct denode *pdep = VTODE(ap->a_dvp);
 	int error;
 	int bn;
-	u_long newcluster, pcl;
+	uint32_t newcluster, pcl;
 	struct direntry *denp;
 	struct msdosfsmount *pmp = pdep->de_pmp;
 	struct buf *bp;
@@ -1363,7 +1363,7 @@ msdosfs_rmdir(v)
 	/*
 	 * Truncate the directory that is being deleted.
 	 */
-	error = detrunc(ip, (u_long)0, IO_SYNC, cnp->cn_cred, cnp->cn_proc);
+	error = detrunc(ip, (uint32_t)0, IO_SYNC, cnp->cn_cred, cnp->cn_proc);
 	cache_purge(vp);
 out:
 	if (dvp)
@@ -1411,9 +1411,9 @@ msdosfs_readdir(v)
 	long on;
 	long lost;
 	long count;
-	u_long dirsperblk;
-	u_long cn;
-	u_long fileno;
+	uint32_t dirsperblk;
+	uint32_t cn;
+	uint32_t fileno;
 	long bias = 0;
 	daddr_t bn, lbn;
 	struct buf *bp;