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

index 0ef7d4b1b5a5fc78d8c9434f25631712d4db32af..a478d06ec2640805f15f024fb9a2b63a0c5121ef 100644 (file)
@@ -2187,9 +2187,9 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
                                         const char *lxc_name,
                                         const char *lxc_path)
 {
+       __do_free char *mntdata = NULL;
        int ret;
        unsigned long mntflags;
-       char *mntdata;
        bool dev, optional, relative;
        unsigned long pflags = 0;
        char *rootfs_path = NULL;
@@ -2222,7 +2222,6 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
        ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type, mntflags,
                          pflags, mntdata, optional, dev, relative, rootfs_path);
 
-       free(mntdata);
        return ret;
 }