From: Eric Sandeen <sandeen@redhat.com>
Date: Wed, 13 Jun 2018 03:26:31 +0000 (-0500)
Subject: mkfs: remove gotos in parse_defaults_file
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6e27aea53f8f19af510c8f471a20bfb15be8413;p=thirdparty%2Fxfsprogs-dev.git

mkfs: remove gotos in parse_defaults_file

There's no point to the gotos in parse_defaults_file; no cleanup
etc that is normally facilitated by a goto, so just remove them.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/mkfs/config.c b/mkfs/config.c
index eb5263874..835adc45f 100644
--- a/mkfs/config.c
+++ b/mkfs/config.c
@@ -637,17 +637,15 @@ parse_defaults_file(
 
 	fp = fdopen(fd, "r");
 	if (!fp)
-		goto out;
+		return -1;
 
 	ret = parse_config_stream(dft, config_file, fp);
 	if (ret) {
 		fclose(fp);
-		goto out;
+		return -1;
 	}
 
 	printf(_("config-file=%s\n"), config_file);
 
 	return 0;
-out:
-	return -1;
 }