diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-11-02 00:08:18 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-11-02 00:08:18 +0000 |
| commit | 10969930464b06a8261f0bed5677855450bd5e46 (patch) | |
| tree | d2fa88ce12193f05057a59815fbe32345ea21162 /sbin/fsck_ffs | |
| parent | 76809e136c7557e5b308e6d5cebe1f037fc3f73b (diff) | |
No need to cast constants or simple variables to (daddr_t). Use
(u_int64_t) instead of (daddr_t) when casting a variable in an
expression passed to DL_SETDSIZE().
Change a variable counting open files from daddr_t to int64_t.
ok deraadt@ with the tweak to fix that pesky expression.
Diffstat (limited to 'sbin/fsck_ffs')
| -rw-r--r-- | sbin/fsck_ffs/fsck.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 848f114184a..378d31c7ca4 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fsck.h,v 1.27 2013/06/11 16:42:04 deraadt Exp $ */ +/* $OpenBSD: fsck.h,v 1.28 2013/11/02 00:08:17 krw Exp $ */ /* $NetBSD: fsck.h,v 1.13 1996/10/11 20:15:46 thorpej Exp $ */ /* @@ -148,7 +148,7 @@ struct bufarea *getdatablk(daddr_t, long); #define dirty(bp) (bp)->b_dirty = 1 #define initbarea(bp) \ (bp)->b_dirty = 0; \ - (bp)->b_bno = (daddr_t)-1; \ + (bp)->b_bno = -1; \ (bp)->b_flags = 0; #define sbdirty() sblk.b_dirty = 1 @@ -257,7 +257,7 @@ char *lfname; /* lost & found directory name */ int lfmode; /* lost & found directory creation mode */ daddr_t n_blks; /* number of blocks in use */ -daddr_t n_files; /* number of files in use */ +int64_t n_files; /* number of files in use */ #define clearinode(dp) \ if (sblock.fs_magic == FS_UFS1_MAGIC) { \ |