summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-10-13 21:17:40 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-10-13 21:17:40 +0000
commit647a0f92a2544a00265b0a8eaff14f417a2dbe0f (patch)
tree11e79f70b729a4496f1d3f58d35cfa015a637776
parentceb0b36530a0cabb0fc6023eddc2327618b5356c (diff)
Fix some type incompatibilities another way round
-rw-r--r--sys/adosfs/advnops.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/adosfs/advnops.c b/sys/adosfs/advnops.c
index 7b489f43b4f..4c391ec5af7 100644
--- a/sys/adosfs/advnops.c
+++ b/sys/adosfs/advnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: advnops.c,v 1.6 1996/08/23 19:11:02 niklas Exp $ */
+/* $OpenBSD: advnops.c,v 1.7 1996/10/13 21:17:39 niklas Exp $ */
/* $NetBSD: advnops.c,v 1.28 1996/04/23 05:18:32 veego Exp $ */
/*
@@ -586,8 +586,7 @@ adosfs_bmap(v)
} */ *sp = v;
struct anode *ap;
struct buf *flbp;
- long nb, fcnt;
- u_long flblk, flblkoff;
+ long nb, fcnt, flblk, flblkoff;
daddr_t *bnp;
daddr_t bn;
int error;
@@ -632,7 +631,7 @@ adosfs_bmap(v)
/*
* check last indirect block cache
*/
- if (flblk < ap->lastlindblk)
+ if (flblk < (long)ap->lastlindblk)
fcnt = 0;
else {
flblk -= ap->lastlindblk;
@@ -676,7 +675,7 @@ adosfs_bmap(v)
* valid table entries stored at offset ADBI_NBLKTABENT.
*/
flblkoff = bn % ANODENDATBLKENT(ap);
- if (flblkoff < adoswordn(flbp, 2 /* ADBI_NBLKTABENT */)) {
+ if (flblkoff < (long)adoswordn(flbp, 2 /* ADBI_NBLKTABENT */)) {
flblkoff = (ap->nwords - 51) - flblkoff;
*bnp = adoswordn(flbp, flblkoff) * ap->amp->secsperblk;
} else {