]> www.infradead.org Git - mtd-utils.git/commitdiff
mkfs.ubifs: check output first
authorAndy Shevchenko <ext-andriy.shevchenko@nokia.com>
Mon, 4 Apr 2011 08:21:15 +0000 (11:21 +0300)
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Mon, 4 Apr 2011 08:27:58 +0000 (11:27 +0300)
Artem: this is jut a clean-up, no functional changes.

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
mkfs.ubifs/mkfs.ubifs.c

index e49a98053f94b2733d6ea47c2ce2197c623deaba..a306dd6b87da959fa53dbed413965d6d05ceffd8 100644 (file)
@@ -675,8 +675,11 @@ static int get_options(int argc, char**argv)
 
        if (optind != argc && !output)
                output = strdup(argv[optind]);
-       if (output)
-               out_ubi = !open_ubi(output);
+
+       if (!output)
+               return err_msg("not output device or file specified");
+
+       out_ubi = !open_ubi(output);
 
        if (out_ubi) {
                c->min_io_size = c->di.min_io_size;
@@ -684,9 +687,6 @@ static int get_options(int argc, char**argv)
                c->max_leb_cnt = c->vi.rsvd_lebs;
        }
 
-       if (!output)
-               return err_msg("not output device or file specified");
-
        if (c->min_io_size == -1)
                return err_msg("min. I/O unit was not specified "
                               "(use -h for help)");