From owner-freebsd-current Sat Feb 13 08:28:10 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id IAA19047 for freebsd-current-outgoing; Sat, 13 Feb 1999 08:28:10 -0800 (PST) (envelope-from owner-freebsd-current@FreeBSD.ORG) Received: from ns.mt.sri.com (sri-gw.MT.net [206.127.105.141]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id IAA19042 for ; Sat, 13 Feb 1999 08:28:08 -0800 (PST) (envelope-from nate@mt.sri.com) Received: from mt.sri.com (rocky.mt.sri.com [206.127.76.100]) by ns.mt.sri.com (8.8.8/8.8.8) with SMTP id JAA11246; Sat, 13 Feb 1999 09:28:06 -0700 (MST) (envelope-from nate@rocky.mt.sri.com) Received: by mt.sri.com (SMI-8.6/SMI-SVR4) id JAA18436; Sat, 13 Feb 1999 09:28:04 -0700 Date: Sat, 13 Feb 1999 09:28:04 -0700 Message-Id: <199902131628.JAA18436@mt.sri.com> From: Nate Williams MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: Jun Kuriyama Cc: FreeBSD-current Subject: Re: Error handling for src/usr.sbin/pccard/pccardc/* In-Reply-To: <36C56288.D80AAC1E@sky.rim.or.jp> References: <36C56288.D80AAC1E@sky.rim.or.jp> X-Mailer: VM 6.34 under 19.16 "Lille" XEmacs Lucid Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG > This is a patch for better (I think) error handling for pccardc. > (obtained from PAO3) > > Please review. Some of it I like, and others I don't. > @@ -138,9 +138,9 @@ > usage(msg) > char *msg; > { > - warnx("enabler: %s", msg); > + fprintf(stderr, "enabler: %s\n", msg); > fprintf(stderr, > -"usage: pccardc enabler slot driver [-m addr size] [-a iobase] [-i irq]\n"); > +"Usage: enabler slot driver [-m addr size] [-a iobase] [-i irq]\n"); The usage really is 'pccardc enabled', not 'enabler', so this should stay, or at least converted to use argv[0] to be consistent with the other changes. > Index: pccardc/pccardc.c > =================================================================== > RCS file: /home/ncvs/src/usr.sbin/pccard/pccardc/pccardc.c,v > retrieving revision 1.7 > diff -u -r1.7 pccardc.c > --- pccardc.c 1998/02/26 14:36:01 1.7 > +++ pccardc.c 1999/02/13 03:51:35 > @@ -84,10 +84,11 @@ > { > int i; > > - fprintf(stderr, "usage: pccardc ...\n"); > - fprintf(stderr, "subcommands:\n"); > + fprintf(stderr, "Usage:\n"); > + fprintf(stderr, "\t%s ...\n", argv[0]); > + fprintf(stderr, "Subcommands:\n"); > for (i = 0; subcommands[i].name; i++) > - fprintf(stderr, "\t%s\n\t\t%s\n", > + fprintf(stderr, "\t%s\t: %s\n", > subcommands[i].name, subcommands[i].help); However, I'm not sure why we are changing the output. It seems gratiutious. > -static void > -usage() > -{ > - fprintf(stderr, "usage: pccardc pccardmem [memory-address]\n"); > - exit(1); > -} > - > int > pccardmem_main(argc, argv) > int argc; > @@ -54,7 +47,8 @@ > int fd; > > if (argc > 2) > - usage(); > + errx(1, "Usage: %s pccardmem [ memory-address ]", argv[0]); > + Again, we use warn one place, and then err. Any chance of keeping it consistent in all places. Nate To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message