diff options
Diffstat (limited to 'sys/lib')
| -rw-r--r-- | sys/lib/libsa/cd9660.c | 8 | ||||
| -rw-r--r-- | sys/lib/libsa/stand.h | 4 | ||||
| -rw-r--r-- | sys/lib/libsa/ufs.c | 22 | ||||
| -rw-r--r-- | sys/lib/libsa/unixdev.c | 4 | ||||
| -rw-r--r-- | sys/lib/libsa/unixdev.h | 4 |
5 files changed, 21 insertions, 21 deletions
diff --git a/sys/lib/libsa/cd9660.c b/sys/lib/libsa/cd9660.c index 45dee369d19..f10cb49352b 100644 --- a/sys/lib/libsa/cd9660.c +++ b/sys/lib/libsa/cd9660.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660.c,v 1.12 2004/07/09 19:20:17 drahn Exp $ */ +/* $OpenBSD: cd9660.c,v 1.13 2011/03/13 00:13:53 deraadt Exp $ */ /* $NetBSD: cd9660.c,v 1.1 1996/09/30 16:01:19 ws Exp $ */ /* @@ -58,7 +58,7 @@ struct ucred; struct file { off_t off; /* Current offset within file */ - daddr_t bno; /* Starting block number */ + daddr32_t bno; /* Starting block number */ off_t size; /* Size of file */ }; @@ -134,7 +134,7 @@ cd9660_open(char *path, struct open_file *f) void *buf; struct iso_primary_descriptor *vd; size_t buf_size, nread, psize, dsize; - daddr_t bno; + daddr32_t bno; int parent, ent; struct ptable_ent *pp; struct iso_directory_record *dp; @@ -293,7 +293,7 @@ cd9660_read(struct open_file *f, void *start, size_t size, size_t *resid) { struct file *fp = (struct file *)f->f_fsdata; int rc = 0; - daddr_t bno; + daddr32_t bno; char buf[ISO_DEFAULT_BLOCK_SIZE]; char *dp; size_t nread, off; diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h index 4195b9ca0a9..c9927eff6eb 100644 --- a/sys/lib/libsa/stand.h +++ b/sys/lib/libsa/stand.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stand.h,v 1.50 2010/12/06 22:51:46 jasper Exp $ */ +/* $OpenBSD: stand.h,v 1.51 2011/03/13 00:13:53 deraadt Exp $ */ /* $NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $ */ /*- @@ -82,7 +82,7 @@ extern int nfsys; struct devsw { char *dv_name; int (*dv_strategy)(void *devdata, int rw, - daddr_t blk, size_t size, + daddr32_t blk, size_t size, void *buf, size_t *rsize); int (*dv_open)(struct open_file *f, ...); int (*dv_close)(struct open_file *f); diff --git a/sys/lib/libsa/ufs.c b/sys/lib/libsa/ufs.c index 4579dbb161c..b5f3eafaf70 100644 --- a/sys/lib/libsa/ufs.c +++ b/sys/lib/libsa/ufs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs.c,v 1.19 2008/01/06 11:17:18 otto Exp $ */ +/* $OpenBSD: ufs.c,v 1.20 2011/03/13 00:13:53 deraadt Exp $ */ /* $NetBSD: ufs.c,v 1.16 1996/09/30 16:01:22 ws Exp $ */ /*- @@ -88,14 +88,14 @@ struct file { level i */ size_t f_blksize[NIADDR]; /* size of buffer */ - daddr_t f_blkno[NIADDR];/* disk address of block in buffer */ + daddr32_t f_blkno[NIADDR];/* disk address of block in buffer */ char *f_buf; /* buffer for data block */ size_t f_buf_size; /* size of data block */ - daddr_t f_buf_blkno; /* block number of data block */ + daddr32_t f_buf_blkno; /* block number of data block */ }; static int read_inode(ino_t, struct open_file *); -static int block_map(struct open_file *, daddr_t, daddr_t *); +static int block_map(struct open_file *, daddr32_t, daddr32_t *); static int buf_read_file(struct open_file *, char **, size_t *); static int search_directory(char *, struct open_file *, ino_t *); #ifdef COMPAT_UFS @@ -120,7 +120,7 @@ read_inode(ino_t inumber, struct open_file *f) buf = alloc(fs->fs_bsize); twiddle(); rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, - fsbtodb(fs, (daddr_t)ino_to_fsba(fs, inumber)), fs->fs_bsize, + fsbtodb(fs, (daddr32_t)ino_to_fsba(fs, inumber)), fs->fs_bsize, buf, &rsize); if (rc) goto out; @@ -157,10 +157,10 @@ out: * contains that block. */ static int -block_map(struct open_file *f, daddr_t file_block, daddr_t *disk_block_p) +block_map(struct open_file *f, daddr32_t file_block, daddr32_t *disk_block_p) { struct file *fp = (struct file *)f->f_fsdata; - daddr_t ind_block_num, *ind_p; + daddr32_t ind_block_num, *ind_p; struct fs *fs = fp->f_fs; int level, idx, rc; @@ -234,7 +234,7 @@ block_map(struct open_file *f, daddr_t file_block, daddr_t *disk_block_p) fp->f_blkno[level] = ind_block_num; } - ind_p = (daddr_t *)fp->f_blk[level]; + ind_p = (daddr32_t *)fp->f_blk[level]; if (level > 0) { idx = file_block / fp->f_nindir[level - 1]; @@ -258,7 +258,7 @@ buf_read_file(struct open_file *f, char **buf_p, size_t *size_p) { struct file *fp = (struct file *)f->f_fsdata; struct fs *fs = fp->f_fs; - daddr_t file_block, disk_block; + daddr32_t file_block, disk_block; size_t block_size; long off; int rc; @@ -485,12 +485,12 @@ ufs_open(char *path, struct open_file *f) * Read file for symbolic link */ size_t buf_size; - daddr_t disk_block; + daddr32_t disk_block; struct fs *fs = fp->f_fs; if (!buf) buf = alloc(fs->fs_bsize); - rc = block_map(f, (daddr_t)0, &disk_block); + rc = block_map(f, (daddr32_t)0, &disk_block); if (rc) goto out; diff --git a/sys/lib/libsa/unixdev.c b/sys/lib/libsa/unixdev.c index bdfd06d9ca6..6dc6a828dd6 100644 --- a/sys/lib/libsa/unixdev.c +++ b/sys/lib/libsa/unixdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unixdev.c,v 1.8 2008/01/23 16:37:56 jsing Exp $ */ +/* $OpenBSD: unixdev.c,v 1.9 2011/03/13 00:13:53 deraadt Exp $ */ /* * Copyright (c) 1996-1998 Michael Shalayeff @@ -39,7 +39,7 @@ #include <lib/libsa/unixdev.h> int -unixstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf, +unixstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf, size_t *rsize) { int rc = 0; diff --git a/sys/lib/libsa/unixdev.h b/sys/lib/libsa/unixdev.h index 9761cdf60b9..c7bc5e56297 100644 --- a/sys/lib/libsa/unixdev.h +++ b/sys/lib/libsa/unixdev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: unixdev.h,v 1.6 2003/06/02 20:20:54 mickey Exp $ */ +/* $OpenBSD: unixdev.h,v 1.7 2011/03/13 00:13:53 deraadt Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -29,7 +29,7 @@ /* unixdev.c */ -int unixstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int unixstrategy(void *, int, daddr32_t, size_t, void *, size_t *); int unixopen(struct open_file *, ...); int unixclose(struct open_file *); int unixioctl(struct open_file *, u_long, void *); |