diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2010-11-03 01:27:19 -0700 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2010-11-13 13:40:51 +0200 |
| commit | d96b3e1775d254cc56dafad6bf824cdffb0e09fa (patch) | |
| tree | d074cb219aa2cc566718cca18b04fabac97ea4f5 | |
| parent | 98aa1a65683efcece1d172a9c2649b5d1d149a19 (diff) | |
mtd-utils: nandwrite: Comment, style fixups
Comment on "blockalign" default value is incorrect; it only defaults
to a 1x multiplier of the actual block size. Perhaps this is a relic
of early NAND where all block sizes were 16KB?
Reformatted a multi-line comment.
Changed separete "if" statements to a combined "if-else-if" since they
were logically combinable. Should have no effect on results with minor
effect on efficiency.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
| -rw-r--r-- | nandwrite.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nandwrite.c b/nandwrite.c index b0c4366..3fbfca9 100644 --- a/nandwrite.c +++ b/nandwrite.c @@ -120,7 +120,7 @@ static bool forcelegacy = false; static bool noecc = false; static bool noskipbad = false; static bool pad = false; -static int blockalign = 1; /* default to using 16K block size */ +static int blockalign = 1; /* default to using actual block size */ static void process_options(int argc, char * const argv[]) { @@ -483,8 +483,7 @@ int main(int argc, char * const argv[]) if ((ret = ioctl(fd, MEMGETBADBLOCK, &offs)) < 0) { perror("ioctl(MEMGETBADBLOCK)"); goto closeall; - } - if (ret == 1) { + } else if (ret == 1) { baderaseblock = true; if (!quiet) fprintf(stderr, "Bad block at %x, %u block(s) " @@ -520,9 +519,11 @@ int main(int argc, char * const argv[]) /* No padding needed - we are done */ if (tinycnt == 0) { - // For standard input, set the imglen to 0 to signal - // the end of the "file". For non standard input, leave - // it as-is to detect an early EOF + /* + * For standard input, set imglen to 0 to signal + * the end of the "file". For nonstandard input, + * leave it as-is to detect an early EOF. + */ if (ifd == STDIN_FILENO) { imglen = 0; } |