From ac535251a5abc6ed8711d42898afe60b7420285c Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 5 Feb 2001 01:45:32 +0000 Subject: [PATCH] don't use errx() in usage fix nested extern --- usr.bin/fdformat/fdformat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/usr.bin/fdformat/fdformat.c b/usr.bin/fdformat/fdformat.c index 7672694663f5..3eaa958c5401 100644 --- a/usr.bin/fdformat/fdformat.c +++ b/usr.bin/fdformat/fdformat.c @@ -1,4 +1,4 @@ -/* $NetBSD: fdformat.c,v 1.6 1999/01/13 21:00:16 hubertf Exp $ */ +/* $NetBSD: fdformat.c,v 1.7 2001/02/05 01:45:32 christos Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -72,6 +72,8 @@ int main __P((int, char **)); void usage __P((void)); int verify_track(int, int, int, struct fdformat_parms *, char *); +extern char *__progname; + int confirm(int def) { @@ -117,9 +119,8 @@ verify_track(int fd, int cyl, int trk, struct fdformat_parms *parms, char *buf) void usage(void) { - extern char *__progname; - - errx(1,"Usage: %s [-f device] [-t type] [-n] [-B nbps] [-S nspt]\n\t[-T ntrk] [-C ncyl] [-P stepspercyl] [-G gaplen]\n\t[-F fillbyte] [-X xfer_rate] [-I interleave]\n", __progname); + fprintf(stderr, "Usage: %s [-f device] [-t type] [-n] [-B nbps] [-S nspt]\n\t[-T ntrk] [-C ncyl] [-P stepspercyl] [-G gaplen]\n\t[-F fillbyte] [-X xfer_rate] [-I interleave]\n", __progname); + exit(1); } #define numarg(which, maskn) \