conf: cleanup macros lxc_chroot

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

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 5385e32853b6cb40e8c1581237be2c6b5f8684a8..eba476dc285ccfa5e8a31e0b2c4353ac376e43e0 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1349,7 +1349,6 @@ int lxc_chroot(const struct lxc_rootfs *rootfs)
        int i, ret;
        char *p, *p2;
        char buf[LXC_LINELEN];
-       FILE *f;
        char *root = rootfs->mount;
 
        nroot = realpath(root, NULL);
@@ -1388,6 +1387,7 @@ int lxc_chroot(const struct lxc_rootfs *rootfs)
         * inherited mounts are locked and we should live with all this trash.
         */
        for (;;) {
+               __do_fclose FILE *f = NULL;
                int progress = 0;
 
                f = fopen("./proc/self/mountinfo", "r");
@@ -1421,8 +1421,6 @@ int lxc_chroot(const struct lxc_rootfs *rootfs)
                                progress++;
                }
 
-               fclose(f);
-
                if (!progress)
                        break;
        }