confile: cleanup set_config_mount()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index dd96240528eca5f9606cb5ba70af9beb1a48d250..e1ebe04137403c8d4206f343d1521cf2cc6290c4 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2208,24 +2208,22 @@ static int set_config_mount_auto(const char *key, const char *value,
 static int set_config_mount(const char *key, const char *value,
                            struct lxc_conf *lxc_conf, void *data)
 {
-       char *mntelem;
-       struct lxc_list *mntlist;
+       __do_free char *mntelem = NULL;
+       __do_free struct lxc_list *mntlist = NULL;
 
        if (lxc_config_value_empty(value))
                return lxc_clear_mount_entries(lxc_conf);
 
        mntlist = malloc(sizeof(*mntlist));
        if (!mntlist)
-               return -1;
+               return ret_errno(ENOMEM);
 
        mntelem = strdup(value);
-       if (!mntelem) {
-               free(mntlist);
-               return -1;
-       }
-       mntlist->elem = mntelem;
+       if (!mntelem)
+               return ret_errno(ENOMEM);
 
-       lxc_list_add_tail(&lxc_conf->mount_list, mntlist);
+       mntlist->elem = move_ptr(mntelem);
+       lxc_list_add_tail(&lxc_conf->mount_list, move_ptr(mntlist));
 
        return 0;
 }