From: Jonathan Amery <jdamery+zgit@ysolde.ucam.org>
Date: Mon, 6 Oct 2014 14:50:27 +0000 (+0100)
Subject: acctdump: Remove badusage from acctdump.c and update usage(FILE *) to usagemessage()
X-Git-Tag: debian/4.4.0~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=c1d08559cd0ddb2809307801b629aab114361474

acctdump: Remove badusage from acctdump.c and update usage(FILE *) to usagemessage()
---

diff --git a/cprogs/acctdump.c b/cprogs/acctdump.c
index 4d3877f..8745f08 100644
--- a/cprogs/acctdump.c
+++ b/cprogs/acctdump.c
@@ -61,23 +61,11 @@ static const char *sigabbrev[]= {
   "XFSZ", "VTALRM", "PROF", "WINCH", "IO"
 };
 
-static void usage(FILE *file) {
+void usagemessage(void) {
   fputs("usage: acctdump [<options>] [<file> ...]\n"
 	"options: -f|--forwards -q|--no-banner -p|--stdin -r|--raw -u|--resource\n",
-	file);
-  if (ferror(file)) { perror("print usage"); exit(8); }
-}
-
-void badusage(const char *fmt, ...) {
-  va_list al;
-
-  fputs("usage error: ",stderr);
-  va_start(al,fmt);
-  vfprintf(stderr,fmt,al);
-  va_end(al);
-  fputs("\n",stderr);
-  usage(stderr);
-  exit(12);
+	stderr);
+  if (ferror(stderr)) { perror("print usage"); exit(8); }
 }
 
 static void checkstdout(void) {