Simplify function

Instead of duplicating the cleanup-code, once for success and once for failure, simply keep a variable fret which is -1 in the beginning and gets set to 0 on success or stays -1 on failure. Signed-off-by: Christian Brauner <christianvanbrauner@gmail.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

Simplify function
e1ff1a15 · Christian Brauner · Stéphane Graber · d6dddf6d · e1ff1a15
Commit e1ff1a15 authored Oct 25, 2015 by Christian Brauner Committed by Stéphane Graber Nov 06, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

conf.c src/lxc/conf.c +6 -8

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1860,6 +1860,7 @@ static int mount_entry_create_overlay_dirs(const struct mntent *mntent,
 	char *upperdir = NULL;
 	char *workdir = NULL;
 	char **opts = NULL;
+	int fret = -1;
 	int ret = 0;
 	size_t arrlen = 0;
 	size_t dirlen = 0;
@@ -1907,14 +1908,12 @@ static int mount_entry_create_overlay_dirs(const struct mntent *mntent,
 				WARN("Failed to create workdir");
 			}
-	free(rootfsdir);
+	fret = 0;
-	lxc_free_array((void **)opts, free);
-	return 0;
 err:
 	free(rootfsdir);
 	lxc_free_array((void **)opts, free);
-	return -1;
+	return fret;
 }
 static int mount_entry_create_aufs_dirs(const struct mntent *mntent,
@@ -1928,6 +1927,7 @@ static int mount_entry_create_aufs_dirs(const struct mntent *mntent,
 	char *tmp = NULL;
 	char *upperdir = NULL;
 	char **opts = NULL;
+	int fret = -1;
 	int ret = 0;
 	size_t arrlen = 0;
 	size_t i;
@@ -1969,14 +1969,12 @@ static int mount_entry_create_aufs_dirs(const struct mntent *mntent,
 			WARN("Failed to create upperdir");
 		}
-	free(rootfsdir);
+	fret = 0;
-	lxc_free_array((void **)opts, free);
-	return 0;
 err:
 	free(rootfsdir);
 	lxc_free_array((void **)opts, free);
-	return -1;
+	return fret;
 }