confile: cleanup set_config_rootfs_path()

parent 99f441f8
...@@ -2412,8 +2412,9 @@ static int set_config_includefiles(const char *key, const char *value, ...@@ -2412,8 +2412,9 @@ static int set_config_includefiles(const char *key, const char *value,
static int set_config_rootfs_path(const char *key, const char *value, static int set_config_rootfs_path(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
__do_free char *dup = NULL;
int ret; int ret;
char *dup, *tmp; char *tmp;
const char *container_path; const char *container_path;
if (lxc_config_value_empty(value)) { if (lxc_config_value_empty(value)) {
...@@ -2424,7 +2425,7 @@ static int set_config_rootfs_path(const char *key, const char *value, ...@@ -2424,7 +2425,7 @@ static int set_config_rootfs_path(const char *key, const char *value,
dup = strdup(value); dup = strdup(value);
if (!dup) if (!dup)
return -1; return ret_errno(ENOMEM);
/* Split <storage type>:<container path> into <storage type> and /* Split <storage type>:<container path> into <storage type> and
* <container path>. Set "rootfs.bdev_type" to <storage type> and * <container path>. Set "rootfs.bdev_type" to <storage type> and
...@@ -2435,10 +2436,8 @@ static int set_config_rootfs_path(const char *key, const char *value, ...@@ -2435,10 +2436,8 @@ static int set_config_rootfs_path(const char *key, const char *value,
*tmp = '\0'; *tmp = '\0';
ret = set_config_path_item(&lxc_conf->rootfs.bdev_type, dup); ret = set_config_path_item(&lxc_conf->rootfs.bdev_type, dup);
if (ret < 0) { if (ret < 0)
free(dup); return ret_errno(ENOMEM);
return -1;
}
tmp++; tmp++;
container_path = tmp; container_path = tmp;
...@@ -2446,10 +2445,7 @@ static int set_config_rootfs_path(const char *key, const char *value, ...@@ -2446,10 +2445,7 @@ static int set_config_rootfs_path(const char *key, const char *value,
container_path = value; container_path = value;
} }
ret = set_config_path_item(&lxc_conf->rootfs.path, container_path); return set_config_path_item(&lxc_conf->rootfs.path, container_path);
free(dup);
return ret;
} }
static int set_config_rootfs_managed(const char *key, const char *value, static int set_config_rootfs_managed(const char *key, const char *value,
......
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