fileio: use _cleanup_

This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2013-03-13 22:47:28 -04:00
parent d29dd03302
commit 1c17cbed55
+5 -6
View File
@@ -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;
}