conf: cleanup macros suggest_default_idmap

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

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 3cf73cb74079466b20fc385fee746e76a1df74ab..c0ac73be2a97ab10d23a228f2dce0fb0985acaf2 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -4617,7 +4617,7 @@ static char *getgname(void)
 void suggest_default_idmap(void)
 {
        __do_free char *gname = NULL, *line = NULL, *uname = NULL;
-       FILE *f;
+       __do_fclose FILE *subuid_f = NULL, *subgid_f = NULL;
        unsigned int uid = 0, urange = 0, gid = 0, grange = 0;
        size_t len = 0;
 
@@ -4629,13 +4629,13 @@ void suggest_default_idmap(void)
        if (!gname)
                return;
 
-       f = fopen(subuidfile, "r");
-       if (!f) {
+       subuid_f = fopen(subuidfile, "r");
+       if (!subuid_f) {
                ERROR("Your system is not configured with subuids");
                return;
        }
 
-       while (getline(&line, &len, f) != -1) {
+       while (getline(&line, &len, subuid_f) != -1) {
                char *p, *p2;
                size_t no_newline = 0;
 
@@ -4665,15 +4665,14 @@ void suggest_default_idmap(void)
                if (lxc_safe_uint(p2, &urange) < 0)
                        WARN("Could not parse UID range");
        }
-       fclose(f);
 
-       f = fopen(subgidfile, "r");
-       if (!f) {
+       subgid_f = fopen(subgidfile, "r");
+       if (!subgid_f) {
                ERROR("Your system is not configured with subgids");
                return;
        }
 
-       while (getline(&line, &len, f) != -1) {
+       while (getline(&line, &len, subgid_f) != -1) {
                char *p, *p2;
                size_t no_newline = 0;
 
@@ -4703,7 +4702,6 @@ void suggest_default_idmap(void)
                if (lxc_safe_uint(p2, &grange) < 0)
                        WARN("Could not parse GID range");
        }
-       fclose(f);
 
        if (!urange || !grange) {
                ERROR("You do not have subuids or subgids allocated");