]> git.proxmox.com Git - mirror_lxc.git/commitdiff
conf: cleanup macros mount_entry_create_dir_file
authorChristian Brauner <christian.brauner@ubuntu.com>
Tue, 19 Feb 2019 22:45:03 +0000 (23:45 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Tue, 19 Feb 2019 22:45:03 +0000 (23:45 +0100)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/conf.c

index e9bbbb1ce34f819d3aa470ca20234caa98f39b06..0ef7d4b1b5a5fc78d8c9434f25631712d4db32af 100644 (file)
@@ -2135,8 +2135,9 @@ static int mount_entry_create_dir_file(const struct mntent *mntent,
                                       const struct lxc_rootfs *rootfs,
                                       const char *lxc_name, const char *lxc_path)
 {
+       __do_free char *p1 = NULL;
        int ret;
-       char *p1, *p2;
+       char *p2;
 
        if (strncmp(mntent->mnt_type, "overlay", 7) == 0) {
                ret = ovl_mkdir(mntent, rootfs, lxc_name, lxc_path);
@@ -2166,7 +2167,6 @@ static int mount_entry_create_dir_file(const struct mntent *mntent,
        p2 = dirname(p1);
 
        ret = mkdir_p(p2, 0755);
-       free(p1);
        if (ret < 0 && errno != EEXIST) {
                SYSERROR("Failed to create directory \"%s\"", path);
                return -1;