From: Edward Shishkin <edward@redhat.com>
Date: Tue, 15 Dec 2009 17:47:53 +0000 (+0100)
Subject: blktrace: print correct usage
X-Git-Tag: blktrace-1.0.2~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=bc14c53fb79ecf2dedf52c55d8601ea4af500ce8;p=blktrace.git

blktrace: print correct usage

Fixup for 498898:

Problem:
When somebody runs blktrace without parameters, it
shows the usage message. The usage message suggests
that version number "x.y.z" is a required parameter,
which is not true.

Solution:
Don't print version number when running
blktrace, blkparce, btt without parameters.

Signed-off-by: Edward Shishkin <edward@redhat.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/blkparse.c b/blkparse.c
index 9bd8023..ffad9b6 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -2702,7 +2702,7 @@ static char usage_str[] =    "\n\n" \
 
 static void usage(char *prog)
 {
-	fprintf(stderr, "Usage: %s %s %s", prog, blkparse_version, usage_str);
+	fprintf(stderr, "Usage: %s %s", prog, usage_str);
 }
 
 int main(int argc, char *argv[])
diff --git a/blktrace.c b/blktrace.c
index a67e1b8..660ad7a 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -493,7 +493,7 @@ static inline void pdc_nev_update(struct devpath *dpp, int cpu, int nevents)
 
 static void show_usage(char *prog)
 {
-	fprintf(stderr, "Usage: %s %s %s", prog, blktrace_version, usage_str);
+	fprintf(stderr, "Usage: %s %s", prog, usage_str);
 }
 
 /*
diff --git a/btt/args.c b/btt/args.c
index 137c2f5..5c5078a 100644
--- a/btt/args.c
+++ b/btt/args.c
@@ -244,8 +244,7 @@ static char usage_str[] = \
 
 static void usage(char *prog)
 {
-	fprintf(stderr, "Usage: %s %s %s", prog, bt_timeline_version,
-		usage_str);
+	fprintf(stderr, "Usage: %s %s", prog, usage_str);
 }
 
 static FILE *setup_ofile(char *fname)