find:: get rid of nested function (it's a gcc-ism)

[oweals/busybox.git] / miscutils / flash_eraseall.c

diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index 53aad3d52cd98d657f27626926cce8a3acb59596..bf9b739a1591f1403452e3aa8d6a7d8f083d43c7 100644 (file)
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -10,14 +10,22 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//usage:#define flash_eraseall_trivial_usage
+//usage:       "[-jNq] MTD_DEVICE"
+//usage:#define flash_eraseall_full_usage "\n\n"
+//usage:       "Erase an MTD device\n"
+//usage:     "\n       -j      Format the device for jffs2"
+//usage:     "\n       -N      Don't skip bad blocks"
+//usage:     "\n       -q      Don't display progress messages"
+
 #include "libbb.h"
 #include <mtd/mtd-user.h>
 #include <linux/jffs2.h>
 
-#define OPTION_J       (1 << 0)
-#define OPTION_Q       (1 << 1)
-#define IS_NAND                (1 << 2)
-#define BBTEST         (1 << 3)
+#define OPTION_J  (1 << 0)
+#define OPTION_N  (1 << 1)
+#define OPTION_Q  (1 << 2)
+#define IS_NAND   (1 << 3)
 
 /* mtd/jffs2-user.h used to have this atrocity:
 extern int target_endian;
@@ -42,15 +50,6 @@ but mtd/jffs2-user.h is gone now (at least 2.6.31.6 does not have it anymore)
 #define cpu_to_je16(v) ((jint16_t){(v)})
 #define cpu_to_je32(v) ((jint32_t){(v)})
 
-static uint32_t crc32(uint32_t val, const void *ss, int len,
-               uint32_t *crc32_table)
-{
-       const unsigned char *s = ss;
-       while (--len >= 0)
-               val = crc32_table[(val ^ *s++) & 0xff] ^ (val >> 8);
-       return val;
-}
-
 static void show_progress(mtd_info_t *meminfo, erase_info_t *erase)
 {
        printf("\rErasing %u Kibyte @ %x - %2u%% complete.",
@@ -73,7 +72,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
        char *mtd_name;
 
        opt_complementary = "=1";
-       flags = BBTEST | getopt32(argv, "jq");
+       flags = getopt32(argv, "jNq");
 
        mtd_name = argv[optind];
        fd = xopen(mtd_name, O_RDWR);
@@ -131,8 +130,9 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
                        cleanmarker.totlen = cpu_to_je32(8);
                }
 
-               cleanmarker.hdr_crc = cpu_to_je32(crc32(0, &cleanmarker, sizeof(struct jffs2_unknown_node) - 4,
-                                       crc32_table));
+               cleanmarker.hdr_crc = cpu_to_je32(
+                       crc32_block_endian0(0, &cleanmarker, sizeof(struct jffs2_unknown_node) - 4, crc32_table)
+               );
        }
 
        /* Don't want to destroy progress indicator by bb_error_msg's */
@@ -140,7 +140,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
 
        for (erase.start = 0; erase.start < meminfo.size;
             erase.start += meminfo.erasesize) {
-               if (flags & BBTEST) {
+               if (!(flags & OPTION_N)) {
                        int ret;
                        loff_t offset = erase.start;
 
@@ -155,7 +155,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
                                 * types e.g. NOR
                                 */
                                if (errno == EOPNOTSUPP) {
-                                       flags &= ~BBTEST;
+                                       flags |= OPTION_N;
                                        if (flags & IS_NAND)
                                                bb_error_msg_and_die("bad block check not available");
                                } else {