]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
mkfs: remove gotos in parse_defaults_file
authorEric Sandeen <sandeen@redhat.com>
Wed, 13 Jun 2018 03:26:31 +0000 (22:26 -0500)
committerEric Sandeen <sandeen@redhat.com>
Wed, 13 Jun 2018 03:26:31 +0000 (22:26 -0500)
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>
mkfs/config.c

index eb5263874bd6186b8f8e77ef45d133342581957b..835adc45f02d02527bdb039f240a3697e6ca5286 100644 (file)
@@ -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;
 }