From 8db92302f65cf1f3e9c4449b4f9e7df880237a41 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Tue, 19 Feb 2019 23:43:04 +0100 Subject: [PATCH] conf: cleanup macros lxc_mount_auto_mounts Signed-off-by: Christian Brauner --- src/lxc/conf.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/lxc/conf.c b/src/lxc/conf.c index d7ae64cef..7bea46468 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -689,10 +689,9 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha }; for (i = 0; default_mounts[i].match_mask; i++) { + __do_free char *destination = NULL, *source = NULL; int saved_errno; unsigned long mflags; - char *destination = NULL; - char *source = NULL; if ((flags & default_mounts[i].match_mask) != default_mounts[i].match_flag) continue; @@ -705,16 +704,12 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha if (!default_mounts[i].destination) { ERROR("BUG: auto mounts destination %d was NULL", i); - free(source); return -1; } /* will act like strdup if %r is not present */ destination = lxc_string_replace("%r", conf->rootfs.path ? conf->rootfs.mount : "", default_mounts[i].destination); if (!destination) { - saved_errno = errno; - free(source); - errno = saved_errno; return -1; } @@ -732,8 +727,6 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha SYSERROR("Failed to mount \"%s\" on \"%s\" with flags %lu", source, destination, mflags); } - free(source); - free(destination); if (r < 0) { errno = saved_errno; return -1; -- 2.47.2