From 3fcde5344bb61a26c4d5948c3e6a710c8437b588 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 22 Jun 2011 09:49:18 -0700 Subject: nanddump: remove --skipbad, leaving --bb=skipbad We are moving to unify bad block handling methods under the --bb=METHOD option. Since --skipbad has not been included in a mtd-utils release yet, we can safely replace it without a deprecation and phase-out period. Signed-off-by: Brian Norris Signed-off-by: Artem Bityutskiy --- nanddump.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'nanddump.c') diff --git a/nanddump.c b/nanddump.c index 08f8964..d2e2e8f 100644 --- a/nanddump.c +++ b/nanddump.c @@ -51,7 +51,6 @@ static void display_help(void) "-b --omitbad Omit bad blocks from the dump\n" "-c --canonicalprint Print canonical Hex+ASCII dump\n" "-f file --file=file Dump to file\n" -"-k --skipbad Skip over bad blocks (see below)\n" "-l length --length=length Length\n" "-n --noecc Read without error correction\n" "-N --noskipbad Read without bad block skipping\n" @@ -111,7 +110,7 @@ static void process_options(int argc, char * const argv[]) for (;;) { int option_index = 0; - static const char *short_options = "bs:f:l:opqnNcak"; + static const char *short_options = "bs:f:l:opqnNca"; static const struct option long_options[] = { {"help", no_argument, 0, 0}, {"version", no_argument, 0, 0}, @@ -126,7 +125,6 @@ static void process_options(int argc, char * const argv[]) {"length", required_argument, 0, 'l'}, {"noecc", no_argument, 0, 'n'}, {"noskipbad", no_argument, 0, 'N'}, - {"skipbad", no_argument, 0, 'k'}, {"quiet", no_argument, 0, 'q'}, {0, 0, 0, 0}, }; @@ -207,15 +205,6 @@ static void process_options(int argc, char * const argv[]) error++; } break; - case 'k': - /* Check if bb_method was already set explicitly */ - if (bb_default) { - bb_default = false; - bb_method = skipbad; - } else { - error++; - } - break; case '?': error++; break; -- cgit v1.2.3