From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 14 Mar 2013 02:47:28 +0000 (-0400)
Subject: fileio: use _cleanup_
X-Git-Tag: v199~201
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=1c17cbed55376b13ed09ec91cd888cb810451026;hp=d29dd033022b41794c7475a5ec4d9d683d18417e;p=elogind.git

fileio: use _cleanup_
---

diff --git a/src/shared/fileio.c b/src/shared/fileio.c
index 4e6ff1604..0eca4416f 100644
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -187,7 +187,8 @@ int parse_env_file(
         assert(fname);
         assert(separator);
 
-        if ((r = read_full_file(fname, &contents, NULL)) < 0)
+        r = read_full_file(fname, &contents, NULL);
+        if (r < 0)
                 return r;
 
         p = contents;
@@ -343,8 +344,9 @@ int load_env_file(const char *fname, char ***rl) {
 }
 
 int write_env_file(const char *fname, char **l) {
-        char **i, *p;
-        FILE *f;
+        char **i;
+        char _cleanup_free_ *p = NULL;
+        FILE _cleanup_fclose_ *f = NULL;
         int r;
 
         r = fopen_temporary(fname, &f, &p);
@@ -376,8 +378,5 @@ int write_env_file(const char *fname, char **l) {
         if (r < 0)
                 unlink(p);
 
-        fclose(f);
-        free(p);
-
         return r;
 }