35c35
< static const char sccsid[] = "@(#)inode.c 8.5 (Berkeley) 2/8/95";
---
> static const char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95";
39a40
>
42a44,45
>
> #include <err.h>
46a50
>
51c55
< static int iblock __P((struct inodesc *idesc, long ilevel, quad_t isize));
---
> static int iblock __P((struct inodesc *, long ilevel, quad_t isize));
58,60c62,63
< register daddr_t *ap;
< int ret;
< long n, ndb, offset;
---
> ufs_daddr_t *ap;
> long ret, n, ndb, offset;
150,152c153,155
< register daddr_t *ap;
< register daddr_t *aplim;
< register struct bufarea *bp;
---
> ufs_daddr_t *ap;
> ufs_daddr_t *aplim;
> struct bufarea *bp;
232c235
< daddr_t blk;
---
> ufs_daddr_t blk;
271c274
< daddr_t iblk;
---
> ufs_daddr_t iblk;
274c277
< errexit("bad inode number %d to ginode\n", inumber);
---
> errx(EEXIT, "bad inode number %d to ginode", inumber);
299c302
< daddr_t dblk;
---
> ufs_daddr_t dblk;
303c306
< errexit("bad inode number %d to nextinode\n", inumber);
---
> errx(EEXIT, "bad inode number %d to nextinode", inumber);
341c344
< errexit("Cannot allocate space for inode buffer\n");
---
> errx(EEXIT, "Cannot allocate space for inode buffer");
375c378
< malloc(sizeof(*inp) + (blks - 1) * sizeof(daddr_t));
---
> malloc(sizeof(*inp) + (blks - 1) * sizeof(ufs_daddr_t));
388,390c391,392
< inp->i_numblks = blks * sizeof(daddr_t);
< bcopy((char *)&dp->di_db[0], (char *)&inp->i_blks[0],
< (size_t)inp->i_numblks);
---
> inp->i_numblks = blks * sizeof(ufs_daddr_t);
> memmove(&inp->i_blks[0], &dp->di_db[0], (size_t)inp->i_numblks);
396c398
< errexit("cannot increase directory list");
---
> errx(EEXIT, "cannot increase directory list");
415c417
< errexit("cannot find inode %d\n", inumber);
---
> errx(EEXIT, "cannot find inode %d", inumber);
475c477
< bcopy(dirp->d_name, idesc->id_name, (size_t)dirp->d_namlen + 1);
---
> memmove(idesc->id_name, dirp->d_name, (size_t)dirp->d_namlen + 1);
517c519
< p = ctime(&dp->di_mtime.tv_sec);
---
> p = ctime(&dp->di_mtime);
525c527
< daddr_t blk;
---
> ufs_daddr_t blk;
545c547
< errexit("BAD STATE %d TO BLKERR", statemap[ino]);
---
> errx(EEXIT, "BAD STATE %d TO BLKERR", statemap[ino]);
588c590
< (void)time(&dp->di_atime.tv_sec);
---
> (void)time(&dp->di_atime);
609c611
< bzero((char *)&idesc, sizeof(struct inodesc));
---
> memset(&idesc, 0, sizeof(struct inodesc));