chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use _cleanup_ when reading config files
[elogind.git]
/
src
/
shared
/
conf-parser.c
diff --git
a/src/shared/conf-parser.c
b/src/shared/conf-parser.c
index c2cf5a6a196d08e4f070770c070ac9a651a418d6..fbacf986a515b3e30ceeb0a1c5fe1c958733d283 100644
(file)
--- a/
src/shared/conf-parser.c
+++ b/
src/shared/conf-parser.c
@@
-262,23
+262,19
@@
int config_parse(
void *userdata) {
unsigned line = 0;
void *userdata) {
unsigned line = 0;
- char *section = NULL;
+ char _cleanup_free_ *section = NULL, *continuation = NULL;
+ FILE _cleanup_fclose_ *ours = NULL;
int r;
int r;
- bool ours = false;
- char *continuation = NULL;
assert(filename);
assert(lookup);
if (!f) {
assert(filename);
assert(lookup);
if (!f) {
- f = fopen(filename, "re");
+ f =
ours =
fopen(filename, "re");
if (!f) {
if (!f) {
- r = -errno;
- log_error("Failed to open configuration file '%s': %s", filename, strerror(-r));
- goto finish;
+ log_error("Failed to open configuration file '%s': %m", filename);
+ return -errno;
}
}
-
- ours = true;
}
while (!feof(f)) {
}
while (!feof(f)) {
@@
-289,19
+285,16
@@
int config_parse(
if (feof(f))
break;
if (feof(f))
break;
- r = -errno;
- log_error("Failed to read configuration file '%s': %s", filename, strerror(-r));
- goto finish;
+ log_error("Failed to read configuration file '%s': %m", filename);
+ return -errno;
}
truncate_nl(l);
if (continuation) {
c = strappend(continuation, l);
}
truncate_nl(l);
if (continuation) {
c = strappend(continuation, l);
- if (!c) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!c)
+ return -ENOMEM;
free(continuation);
continuation = NULL;
free(continuation);
continuation = NULL;
@@
-323,10
+316,8
@@
int config_parse(
continuation = c;
else {
continuation = strdup(l);
continuation = c;
else {
continuation = strdup(l);
- if (!continuation) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!continuation)
+ return -ENOMEM;
}
continue;
}
continue;
@@
-344,19
+335,10
@@
int config_parse(
free(c);
if (r < 0)
free(c);
if (r < 0)
-
goto finish
;
+
return r
;
}
}
- r = 0;
-
-finish:
- free(section);
- free(continuation);
-
- if (f && ours)
- fclose(f);
-
- return r;
+ return 0;
}
int config_parse_int(
}
int config_parse_int(
@@
-792,7
+774,7
@@
int config_parse_path_strv(
return 0;
}
return 0;
}
-int config_parse_
u
sec(
+int config_parse_sec(
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
@@
-809,7
+791,7
@@
int config_parse_usec(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- if (parse_
u
sec(rvalue, usec) < 0) {
+ if (parse_sec(rvalue, usec) < 0) {
log_error("[%s:%u] Failed to parse time value, ignoring: %s", filename, line, rvalue);
return 0;
}
log_error("[%s:%u] Failed to parse time value, ignoring: %s", filename, line, rvalue);
return 0;
}