From 5d1f41857b36fb8632f5d88314e40edd4abc94ef Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Wed, 24 Jun 2009 08:18:38 +0000 Subject: Remove duplicated [file] from usage help A file is already specified directly in conjunction for -r/-w/-v. Corresponding to flashrom svn r628. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Uwe Hermann --- flashrom.8 | 2 +- flashrom.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flashrom.8 b/flashrom.8 index d51034e..423ee29 100644 --- a/flashrom.8 +++ b/flashrom.8 @@ -4,7 +4,7 @@ flashrom \- detect, read, write, verify and erase flash chips .SH SYNOPSIS .B flashrom \fR[\fB\-VfLzhR\fR] [\fB\-E\fR|\fB\-r\fR file|\fB\-w\fR file|\fB\-v\fR file] [\fB\-c\fR chipname] [\fB\-m\fR [vendor:]part] - [\fB\-l\fR file] [\fB\-i\fR image] [\fB\-p\fR programmer] [file] + [\fB\-l\fR file] [\fB\-i\fR image] [\fB\-p\fR programmer] .SH DESCRIPTION .B flashrom is a utility for detecting, reading, writing, verifying and erasing flash diff --git a/flashrom.c b/flashrom.c index 914ee4b..e5e4994 100644 --- a/flashrom.c +++ b/flashrom.c @@ -493,7 +493,7 @@ int erase_flash(struct flashchip *flash) void usage(const char *name) { printf("usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname]\n" - " [-m [vendor:]part] [-l file] [-i image] [-p programmer] [file]\n\n", name); + " [-m [vendor:]part] [-l file] [-i image] [-p programmer]\n\n", name); printf("Please note that the command line interface for flashrom will " "change before\nflashrom 1.0. Do not use flashrom in scripts " @@ -518,9 +518,8 @@ void usage(const char *name) " it87spi, ft2232spi, serprog)\n" " -h | --help: print this help text\n" " -R | --version: print the version (release)\n" - "\nYou can specify one of -E, -r, -w, -v or no operation. " - "If no operation is\nspecified, then all that happens" - " is that flash info is dumped.\n\n"); + "\nYou can specify one of -E, -r, -w, -v or no operation. If no operation is\n" + "specified, then all that happens is that flash info is dumped.\n\n"); exit(1); } -- cgit v1.1