diff options
| author | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2009-08-14 13:05:09 +0000 |
|---|---|---|
| committer | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2009-08-14 13:05:09 +0000 |
| commit | d2b70e8ef5ab7b2f6d028b2a85030ba192e35a1a (patch) | |
| tree | 69be996b6a2528bb7088efeb18880c14925a32c4 /sys | |
| parent | 93158bed606ba453666838fefa6789ef1da96226 (diff) | |
- use u_char consistently
- minor formatting
ok oga@ otto@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ufs/ffs/ffs_extern.h | 10 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_subr.c | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index 47888bc0215..928f738985d 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.33 2008/01/05 19:49:26 otto Exp $ */ +/* $OpenBSD: ffs_extern.h,v 1.34 2009/08/14 13:05:08 jasper Exp $ */ /* $NetBSD: ffs_extern.h,v 1.4 1996/02/09 22:22:22 christos Exp $ */ /* @@ -122,15 +122,15 @@ int ffs_update(struct inode *, struct timespec *, struct timespec *, int); int ffs_truncate(struct inode *, off_t, int, struct ucred *); /* ffs_subr.c */ -int ffs_bufatoff(struct inode *, off_t, char **, struct buf **); +int ffs_bufatoff(struct inode *, off_t, char **, struct buf **); void ffs_fragacct(struct fs *, int, int32_t[], int); #ifdef DIAGNOSTIC void ffs_checkoverlap(struct buf *, struct inode *); #endif -int ffs_isfreeblock(struct fs *, unsigned char *, daddr64_t); -int ffs_isblock(struct fs *, unsigned char *, daddr64_t); +int ffs_isfreeblock(struct fs *, u_char *, daddr64_t); +int ffs_isblock(struct fs *, u_char *, daddr64_t); void ffs_clrblock(struct fs *, u_char *, daddr64_t); -void ffs_setblock(struct fs *, unsigned char *, daddr64_t); +void ffs_setblock(struct fs *, u_char *, daddr64_t); /* ffs_vfsops.c */ int ffs_mountroot(void); diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index ad1feed3945..9285b22c5f1 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_subr.c,v 1.23 2009/08/14 12:50:33 jasper Exp $ */ +/* $OpenBSD: ffs_subr.c,v 1.24 2009/08/14 13:05:08 jasper Exp $ */ /* $NetBSD: ffs_subr.c,v 1.6 1996/03/17 02:16:23 christos Exp $ */ /* @@ -81,10 +81,10 @@ ffs_bufatoff(struct inode *ip, off_t offset, char **res, struct buf **bpp) #else /* Prototypes for userland */ void ffs_fragacct(struct fs *, int, int32_t[], int); -int ffs_isfreeblock(struct fs *, unsigned char *, daddr64_t); -int ffs_isblock(struct fs *, unsigned char *, daddr64_t); +int ffs_isfreeblock(struct fs *, u_char *, daddr64_t); +int ffs_isblock(struct fs *, u_char *, daddr64_t); void ffs_clrblock(struct fs *, u_char *, daddr64_t); -void ffs_setblock(struct fs *, unsigned char *, daddr64_t); +void ffs_setblock(struct fs *, u_char *, daddr64_t); __dead void panic(const char *, ...); #endif @@ -156,9 +156,9 @@ ffs_checkoverlap(struct buf *bp, struct inode *ip) * check if a block is available */ int -ffs_isblock(struct fs *fs, unsigned char *cp, daddr64_t h) +ffs_isblock(struct fs *fs, u_char *cp, daddr64_t h) { - unsigned char mask; + u_char mask; switch (fs->fs_frag) { default: @@ -204,7 +204,7 @@ ffs_clrblock(struct fs *fs, u_char *cp, daddr64_t h) * put a block into the map */ void -ffs_setblock(struct fs *fs, unsigned char *cp, daddr64_t h) +ffs_setblock(struct fs *fs, u_char *cp, daddr64_t h) { switch (fs->fs_frag) { @@ -228,7 +228,7 @@ ffs_setblock(struct fs *fs, unsigned char *cp, daddr64_t h) * check if a block is free */ int -ffs_isfreeblock(struct fs *fs, unsigned char *cp, daddr64_t h) +ffs_isfreeblock(struct fs *fs, u_char *cp, daddr64_t h) { switch (fs->fs_frag) { |