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 9bd8023ecdc39da38c3bf18e406b11ac3e8c1150..ffad9b62d2d29e75b416e27dc76475c6158e40f1 100644 (file)
--- 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 a67e1b87939d63437348bf42bba19795fc1a21b5..660ad7a274f88e985ddd46ca93c27b7a0948f8af 100644 (file)
--- 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 137c2f59ffbf564eb893cb77e054d64cf3405362..5c5078ab2c81a8f86a5b1a31e647b346a5d9e736 100644 (file)
--- 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)