diff options
Diffstat (limited to 'sbin/dumplfs')
| -rw-r--r-- | sbin/dumplfs/dumplfs.c | 51 | ||||
| -rw-r--r-- | sbin/dumplfs/misc.c | 10 |
2 files changed, 16 insertions, 45 deletions
diff --git a/sbin/dumplfs/dumplfs.c b/sbin/dumplfs/dumplfs.c index cb4e41836b1..1c5f0ca2fac 100644 --- a/sbin/dumplfs/dumplfs.c +++ b/sbin/dumplfs/dumplfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumplfs.c,v 1.9 2003/06/02 20:06:14 millert Exp $ */ +/* $OpenBSD: dumplfs.c,v 1.10 2004/07/17 02:14:32 deraadt Exp $ */ /* $NetBSD: dumplfs.c,v 1.7 1995/12/14 22:36:34 thorpej Exp $ */ /*- @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dumplfs.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: dumplfs.c,v 1.9 2003/06/02 20:06:14 millert Exp $"; +static char rcsid[] = "$OpenBSD: dumplfs.c,v 1.10 2004/07/17 02:14:32 deraadt Exp $"; #endif #endif /* not lint */ @@ -106,9 +106,7 @@ char *special; (void)printf("%d\tINUSE\t%d\t%8X \n", \ i, ip->if_version, ip->if_daddr) int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { struct lfs lfs_sb1, lfs_sb2, *lfs_master; daddr_t seg_addr; @@ -184,10 +182,7 @@ main(argc, argv) * printed out rather than making this code incredibly efficient. */ static void -dump_ifile(fd, lfsp, do_ientries) - int fd; - struct lfs *lfsp; - int do_ientries; +dump_ifile(int fd, struct lfs *lfsp, int do_ientries) { IFILE *ipage; struct dinode *dip, *dpage; @@ -312,10 +307,7 @@ e0: free(dpage); } static int -dump_ipage_ifile(i, pp, tot) - int i; - IFILE *pp; - int tot; +dump_ipage_ifile(int i, IFILE *pp, int tot) { IFILE *ip; int cnt, max; @@ -328,11 +320,7 @@ dump_ipage_ifile(i, pp, tot) } static int -dump_ipage_segusage(lfsp, i, pp, tot) - struct lfs *lfsp; - int i; - IFILE *pp; - int tot; +dump_ipage_segusage(struct lfs *lfsp, int i, IFILE *pp, int tot) { SEGUSE *sp; int cnt, max; @@ -348,8 +336,7 @@ dump_ipage_segusage(lfsp, i, pp, tot) } static void -dump_dinode(dip) - struct dinode *dip; +dump_dinode(struct dinode *dip) { int i; time_t at, mt, ct; @@ -381,11 +368,7 @@ dump_dinode(dip) } static int -dump_sum(fd, lfsp, sp, segnum, addr) - struct lfs *lfsp; - SEGSUM *sp; - int fd, segnum; - daddr_t addr; +dump_sum(int fd, struct lfs *lfsp, SEGSUM *sp, int segnum, daddr_t addr) { FINFO *fp; u_int32_t *dp; @@ -453,11 +436,7 @@ dump_sum(fd, lfsp, sp, segnum, addr) } static void -dump_segment(fd, segnum, addr, lfsp, dump_sb) - int fd, segnum; - daddr_t addr; - struct lfs *lfsp; - int dump_sb; +dump_segment(int fd, int segnum, daddr_t addr, struct lfs *lfsp, int dump_sb) { struct lfs lfs_sb, *sbp; SEGSUM *sump; @@ -506,8 +485,7 @@ dump_segment(fd, segnum, addr, lfsp, dump_sb) } static void -dump_super(lfsp) - struct lfs *lfsp; +dump_super(struct lfs *lfsp) { int i; @@ -591,8 +569,7 @@ dump_super(lfsp) } static void -addseg(arg) - char *arg; +addseg(char *arg) { SEGLIST *p; @@ -604,9 +581,7 @@ addseg(arg) } static void -dump_cleaner_info(lfsp, ipage) - struct lfs *lfsp; - void *ipage; +dump_cleaner_info(struct lfs *lfsp, void *ipage) { CLEANERINFO *cip; @@ -616,7 +591,7 @@ dump_cleaner_info(lfsp, ipage) } static void -usage() +usage(void) { (void)fprintf(stderr, "usage: dumplfs [-ai] [-s segnum] file\n"); exit(1); diff --git a/sbin/dumplfs/misc.c b/sbin/dumplfs/misc.c index 34bb1e49c09..a9fcb9ccbad 100644 --- a/sbin/dumplfs/misc.c +++ b/sbin/dumplfs/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.3 2003/06/02 20:06:14 millert Exp $ */ +/* $OpenBSD: misc.c,v 1.4 2004/07/17 02:14:32 deraadt Exp $ */ /* $NetBSD: misc.c,v 1.3 1995/03/18 14:55:23 cgd Exp $ */ /*- @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: misc.c,v 1.3 2003/06/02 20:06:14 millert Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.4 2004/07/17 02:14:32 deraadt Exp $"; #endif #endif /* not lint */ @@ -49,11 +49,7 @@ static char rcsid[] = "$OpenBSD: misc.c,v 1.3 2003/06/02 20:06:14 millert Exp $" #include "extern.h" void -get(fd, off, p, len) - int fd; - off_t off; - void *p; - size_t len; +get(int fd, off_t off, void *p, size_t len) { int rbytes; |