diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2012-01-16 17:32:08 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2012-01-16 17:32:08 +0000 |
| commit | f13b98e11b551f366555dd66f8a787e0fa3f9056 (patch) | |
| tree | e58b960930d1a51fc848c020f7d96a8e36c32897 /sbin | |
| parent | 082c28ce84826bbddba7d3259503f056fd062515 (diff) | |
Nuke unused parameter (f) to makebootarea(). Unused since r1.123
(2008), when '-r' support was removed. Spotted by jsg@ with the
assistance of clang.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/disklabel/disklabel.c | 10 | ||||
| -rw-r--r-- | sbin/disklabel/extern.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 761bdd2807f..b42f80e60ee 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.183 2012/01/02 03:40:31 krw Exp $ */ +/* $OpenBSD: disklabel.c,v 1.184 2012/01/16 17:32:07 krw Exp $ */ /* * Copyright (c) 1987, 1993 @@ -250,7 +250,7 @@ main(int argc, char *argv[]) if (installboot && argc == 3) makelabel(argv[2], NULL, &lab); #endif - lp = makebootarea(bootarea, &lab, f); + lp = makebootarea(bootarea, &lab); *lp = lab; if (!(t = fopen(argv[1], "r"))) err(4, "%s", argv[1]); @@ -267,7 +267,7 @@ main(int argc, char *argv[]) usage(); else makelabel(argv[1], argc == 3 ? argv[2] : NULL, &lab); - lp = makebootarea(bootarea, &lab, f); + lp = makebootarea(bootarea, &lab); *lp = lab; error = checklabel(&lab); if (error == 0) @@ -282,7 +282,7 @@ main(int argc, char *argv[]) tlab = lab; if (argc == 2) makelabel(argv[1], NULL, &lab); - lp = makebootarea(bootarea, &lab, f); + lp = makebootarea(bootarea, &lab); *lp = tlab; error = checklabel(&lab); if (error == 0) @@ -485,7 +485,7 @@ readlabel(int f) * Returns a pointer to the disklabel portion of the bootarea. */ struct disklabel * -makebootarea(char *boot, struct disklabel *dp, int f) +makebootarea(char *boot, struct disklabel *dp) { struct disklabel *lp; char *p; diff --git a/sbin/disklabel/extern.h b/sbin/disklabel/extern.h index b1eb77cbb98..e3bdecc7df4 100644 --- a/sbin/disklabel/extern.h +++ b/sbin/disklabel/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.22 2011/04/16 11:44:41 krw Exp $ */ +/* $OpenBSD: extern.h,v 1.23 2012/01/16 17:32:07 krw Exp $ */ /* * Copyright (c) 2003 Theo de Raadt <deraadt@openbsd.org> @@ -28,7 +28,7 @@ void display_partition(FILE *, struct disklabel *, int, char); int duid_parse(struct disklabel *, char *); void readlabel(int); -struct disklabel *makebootarea(char *, struct disklabel *, int); +struct disklabel *makebootarea(char *, struct disklabel *); int editor(int); void editor_allocspace(struct disklabel *); void mpsave(struct disklabel *); |