From: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Date: Mon, 4 Apr 2011 08:21:15 +0000 (+0300)
Subject: mkfs.ubifs: check output first
X-Git-Tag: v1.4.5~172
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1a48432ba8ae05af773e4a4cc006c8a611fbee8f;p=mtd-utils.git

mkfs.ubifs: check output first

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>
---

diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c
index e49a980..a306dd6 100644
--- a/mkfs.ubifs/mkfs.ubifs.c
+++ b/mkfs.ubifs/mkfs.ubifs.c
@@ -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)");