39c39
< * $FreeBSD: head/sbin/ffsinfo/ffsinfo.c 69926 2000-12-12 20:03:17Z tomsoft $
---
> * $FreeBSD: head/sbin/ffsinfo/ffsinfo.c 77885 2001-06-07 20:43:00Z tomsoft $
52c52
< "$FreeBSD: head/sbin/ffsinfo/ffsinfo.c 69926 2000-12-12 20:03:17Z tomsoft $";
---
> "$FreeBSD: head/sbin/ffsinfo/ffsinfo.c 77885 2001-06-07 20:43:00Z tomsoft $";
97c97
< static void rdfs(daddr_t, int, char *, int);
---
> static void rdfs(daddr_t, size_t, void *, int);
108c108
< rdfs(daddr_t bno, int size, char *bf, int fsi)
---
> rdfs(daddr_t bno, size_t size, void *bf, int fsi)
111c111
< int n;
---
> ssize_t n;
118,119c118,119
< n = read(fsi, bf, (size_t)size);
< if (n != size) {
---
> n = read(fsi, bf, size);
> if (n != (ssize_t)size) {
299c299
< rdfs((daddr_t)(SBOFF/DEV_BSIZE), SBSIZE, (char *)&(sblock), fsi);
---
> rdfs((daddr_t)(SBOFF/DEV_BSIZE), (size_t)SBSIZE, (void *)&sblock, fsi);
329c329,330
< fscs = (struct csum *)calloc(1, (size_t)sblock.fs_cssize);
---
> fscs = (struct csum *)calloc((size_t)1,
> (size_t)sblock.fs_cssize);
339c340
< numfrags(&sblock, i)), sblock.fs_cssize - i <
---
> numfrags(&sblock, i)), (size_t)(sblock.fs_cssize-i<
341c342
< sblock.fs_bsize, ((char *)fscs) + i, fsi);
---
> sblock.fs_bsize), (void *)(((char *)fscs)+i), fsi);
349,350c350,351
< snprintf(dbg_line, 80, "%d. csum in fscs",
< dbg_csc);
---
> snprintf(dbg_line, sizeof(dbg_line),
> "%d. csum in fscs", dbg_csc);
361c362
< snprintf(dbg_line, 80, "cgr %d", cylno);
---
> snprintf(dbg_line, sizeof(dbg_line), "cgr %d", cylno);
367c368
< SBSIZE, (char *)&osblock, fsi);
---
> (size_t)SBSIZE, (void *)&osblock, fsi);
374,375c375,376
< rdfs(fsbtodb(&sblock, cgtod(&sblock, cylno)), sblock.fs_cgsize,
< (char *)&acg, fsi);
---
> rdfs(fsbtodb(&sblock, cgtod(&sblock, cylno)),
> (size_t)sblock.fs_cgsize, (void *)&acg, fsi);
455c456
< snprintf(comment, 80, "Inode 0x%08x", inode);
---
> snprintf(comment, sizeof(comment), "Inode 0x%08x", inode);
475,477c476,479
< rdfs(fsbtodb(&sblock, ino->di_ib[0]), sblock.fs_bsize, i1blk,
< fsi);
< snprintf(comment, 80, "Inode 0x%08x: indirect 0", inode);
---
> rdfs(fsbtodb(&sblock, ino->di_ib[0]), (size_t)sblock.fs_bsize,
> (void *)&i1blk, fsi);
> snprintf(comment, sizeof(comment), "Inode 0x%08x: indirect 0",
> inode);
488,490c490,493
< rdfs(fsbtodb(&sblock, ino->di_ib[1]), sblock.fs_bsize, i2blk,
< fsi);
< snprintf(comment, 80, "Inode 0x%08x: indirect 1", inode);
---
> rdfs(fsbtodb(&sblock, ino->di_ib[1]), (size_t)sblock.fs_bsize,
> (void *)&i2blk, fsi);
> snprintf(comment, sizeof(comment), "Inode 0x%08x: indirect 1",
> inode);
497c500
< ind2ptr=&((ufs_daddr_t *)&i2blk)[ind2ctr];
---
> ind2ptr=&((ufs_daddr_t *)(void *)&i2blk)[ind2ctr];
499,502c502,505
< rdfs(fsbtodb(&sblock, *ind2ptr), sblock.fs_bsize,
< i1blk, fsi);
< snprintf(comment, 80, "Inode 0x%08x: indirect 1->%d",
< inode, ind2ctr);
---
> rdfs(fsbtodb(&sblock, *ind2ptr),
> (size_t)sblock.fs_bsize, (void *)&i1blk, fsi);
> snprintf(comment, sizeof(comment),
> "Inode 0x%08x: indirect 1->%d", inode, ind2ctr);
514,516c517,520
< rdfs(fsbtodb(&sblock, ino->di_ib[2]), sblock.fs_bsize, i3blk,
< fsi);
< snprintf(comment, 80, "Inode 0x%08x: indirect 2", inode);
---
> rdfs(fsbtodb(&sblock, ino->di_ib[2]), (size_t)sblock.fs_bsize,
> (void *)&i3blk, fsi);
> snprintf(comment, sizeof(comment), "Inode 0x%08x: indirect 2",
> inode);
526c530
< ind3ptr=&((ufs_daddr_t *)&i3blk)[ind3ctr];
---
> ind3ptr=&((ufs_daddr_t *)(void *)&i3blk)[ind3ctr];
528,531c532,535
< rdfs(fsbtodb(&sblock, *ind3ptr), sblock.fs_bsize,
< i2blk, fsi);
< snprintf(comment, 80, "Inode 0x%08x: indirect 2->%d",
< inode, ind3ctr);
---
> rdfs(fsbtodb(&sblock, *ind3ptr),
> (size_t)sblock.fs_bsize, (void *)&i2blk, fsi);
> snprintf(comment, sizeof(comment),
> "Inode 0x%08x: indirect 2->%d", inode, ind3ctr);
539,540c543,544
< ind2ptr=&((ufs_daddr_t *)&i2blk)[ind2ctr];
<
---
> ind2ptr=&((ufs_daddr_t *)(void *)&i2blk)
> [ind2ctr];
542,543c546,548
< sblock.fs_bsize, i1blk, fsi);
< snprintf(comment, 80,
---
> (size_t)sblock.fs_bsize, (void *)&i1blk,
> fsi);
> snprintf(comment, sizeof(comment),
624c629
< pi=(struct dinode *)ablk;
---
> pi=(struct dinode *)(void *)ablk;
632,633c637,638
< rdfs(fsbtodb(&sblock, iblk), sblock.fs_bsize, (char *)&ablk,
< fsi);
---
> rdfs(fsbtodb(&sblock, iblk), (size_t)sblock.fs_bsize,
> (void *)&ablk, fsi);