conf: cleanup macros lxc_mount_auto_mounts

parent 957c4704
...@@ -689,10 +689,9 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha ...@@ -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++) { for (i = 0; default_mounts[i].match_mask; i++) {
__do_free char *destination = NULL, *source = NULL;
int saved_errno; int saved_errno;
unsigned long mflags; unsigned long mflags;
char *destination = NULL;
char *source = NULL;
if ((flags & default_mounts[i].match_mask) != default_mounts[i].match_flag) if ((flags & default_mounts[i].match_mask) != default_mounts[i].match_flag)
continue; continue;
...@@ -705,16 +704,12 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha ...@@ -705,16 +704,12 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha
if (!default_mounts[i].destination) { if (!default_mounts[i].destination) {
ERROR("BUG: auto mounts destination %d was NULL", i); ERROR("BUG: auto mounts destination %d was NULL", i);
free(source);
return -1; return -1;
} }
/* will act like strdup if %r is not present */ /* will act like strdup if %r is not present */
destination = lxc_string_replace("%r", conf->rootfs.path ? conf->rootfs.mount : "", default_mounts[i].destination); destination = lxc_string_replace("%r", conf->rootfs.path ? conf->rootfs.mount : "", default_mounts[i].destination);
if (!destination) { if (!destination) {
saved_errno = errno;
free(source);
errno = saved_errno;
return -1; return -1;
} }
...@@ -732,8 +727,6 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha ...@@ -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); SYSERROR("Failed to mount \"%s\" on \"%s\" with flags %lu", source, destination, mflags);
} }
free(source);
free(destination);
if (r < 0) { if (r < 0) {
errno = saved_errno; errno = saved_errno;
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment