diff options
| author |   deraadt <deraadt@openbsd.org> | 2003-06-25 21:24:10 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2003-06-25 21:24:10 +0000 |
| commit | 8d1318c465ee0dc339cc4a83521fb43588d3bcb8 (patch) | |
| tree | 6638ba44042895ace81e5cb005096ed723389add | |
| parent | ansi (diff) | |
| download | wireguard-openbsd-8d1318c465ee0dc339cc4a83521fb43588d3bcb8.tar.xz wireguard-openbsd-8d1318c465ee0dc339cc4a83521fb43588d3bcb8.zip | |
proto repairs
| -rw-r--r-- | sbin/newfs/mkfs.c | 7 | ||||
| -rw-r--r-- | sbin/newfs/newfs.c | 8 | ||||
| -rw-r--r-- | sbin/newlfs/newfs.c | 6 |
3 files changed, 10 insertions, 11 deletions
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index d2e09638011..60b50585e81 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkfs.c,v 1.29 2003/06/11 06:22:14 deraadt Exp $ */ +/* $OpenBSD: mkfs.c,v 1.30 2003/06/25 21:24:10 deraadt Exp $ */ /* $NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)mkfs.c 8.3 (Berkeley) 2/3/94"; #else -static char rcsid[] = "$OpenBSD: mkfs.c,v 1.29 2003/06/11 06:22:14 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mkfs.c,v 1.30 2003/06/25 21:24:10 deraadt Exp $"; #endif #endif /* not lint */ @@ -126,7 +126,7 @@ char *buf; int fsi, fso; daddr_t alloc(int, int); -static int charsperline(); +static int charsperline(void); void initcg(int, time_t); void wtfs(daddr_t, int, void *); void fsinit(time_t); @@ -1176,7 +1176,6 @@ charsperline(void) int columns; char *cp; struct winsize ws; - extern char *getenv(); columns = 0; if (ioctl(0, TIOCGWINSZ, &ws) != -1) diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 2786b1a3fcc..4d2cdf7a042 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.41 2003/06/11 06:22:14 deraadt Exp $ */ +/* $OpenBSD: newfs.c,v 1.42 2003/06/25 21:24:10 deraadt Exp $ */ /* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */ /* @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)newfs.c 8.8 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: newfs.c,v 1.41 2003/06/11 06:22:14 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: newfs.c,v 1.42 2003/06/25 21:24:10 deraadt Exp $"; #endif #endif /* not lint */ @@ -194,7 +194,7 @@ main(int argc, char *argv[]) struct partition *pp; struct disklabel *lp; struct disklabel mfsfakelabel; - struct disklabel *getdisklabel(); + struct disklabel *getdisklabel(char *, int); struct partition oldpartition; struct stat st; struct statfs *mp; @@ -682,7 +682,7 @@ getdisklabel(char *s, int fd) if (ioctl(fd, DIOCGDINFO, (char *)&lab) < 0) { #ifdef COMPAT if (disktype) { - struct disklabel *lp, *getdiskbyname(); + struct disklabel *lp; unlabeled++; lp = getdiskbyname(disktype); diff --git a/sbin/newlfs/newfs.c b/sbin/newlfs/newfs.c index d974a72661f..614bb81f9fd 100644 --- a/sbin/newlfs/newfs.c +++ b/sbin/newlfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.13 2003/06/02 20:06:16 millert Exp $ */ +/* $OpenBSD: newfs.c,v 1.14 2003/06/25 21:24:25 deraadt Exp $ */ /* $NetBSD: newfs.c,v 1.5 1996/05/16 07:17:50 thorpej Exp $ */ /*- @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)newfs.c 8.5 (Berkeley) 5/24/95"; #else -static char rcsid[] = "$OpenBSD: newfs.c,v 1.13 2003/06/02 20:06:16 millert Exp $"; +static char rcsid[] = "$OpenBSD: newfs.c,v 1.14 2003/06/25 21:24:25 deraadt Exp $"; #endif #endif /* not lint */ @@ -346,7 +346,7 @@ getdisklabel(s, fd) if (ioctl(fd, DIOCGDINFO, (char *)&lab) < 0) { #ifdef COMPAT if (disktype) { - struct disklabel *lp, *getdiskbyname(); + struct disklabel *lp; unlabeled++; lp = getdiskbyname(disktype); |