chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement proper binding on ports
[elogind.git]
/
conf-parser.c
diff --git
a/conf-parser.c
b/conf-parser.c
index 3a7da7960ca84f5f5418f95603d27beed4702808..2ea6911257db25ab302c5af7b20ffee3dfbeea9b 100644
(file)
--- a/
conf-parser.c
+++ b/
conf-parser.c
@@
-10,6
+10,7
@@
#include "util.h"
#include "macro.h"
#include "strv.h"
#include "util.h"
#include "macro.h"
#include "strv.h"
+#include "log.h"
#define WHITESPACE " \t\n"
#define COMMENTS "#;\n"
#define WHITESPACE " \t\n"
#define COMMENTS "#;\n"
@@
-44,7
+45,7
@@
static int next_assignment(
return t->parse(filename, line, section, lvalue, rvalue, t->data, userdata);
}
return t->parse(filename, line, section, lvalue, rvalue, t->data, userdata);
}
-
fprintf(stderr, "[%s:%u] Unknown lvalue '%s' in section '%s'.\n
", filename, line, lvalue, strna(section));
+
log_error("[%s:%u] Unknown lvalue '%s' in section '%s'.
", filename, line, lvalue, strna(section));
return -EBADMSG;
}
return -EBADMSG;
}
@@
-122,7
+123,7
@@
static int parse_line(const char *filename, unsigned line, char **section, const
assert(k > 0);
if (b[k-1] != ']') {
assert(k > 0);
if (b[k-1] != ']') {
-
fprintf(stderr, "[%s:%u] Invalid section header.\n
", filename, line);
+
log_error("[%s:%u] Invalid section header.
", filename, line);
return -EBADMSG;
}
return -EBADMSG;
}
@@
-151,7
+152,7
@@
static int parse_line(const char *filename, unsigned line, char **section, const
}
if (!(e = strchr(b, '='))) {
}
if (!(e = strchr(b, '='))) {
-
fprintf(stderr, "[%s:%u] Missing '='.\n
", filename, line);
+
log_error("[%s:%u] Missing '='.
", filename, line);
return -EBADMSG;
}
return -EBADMSG;
}
@@
-173,7
+174,7
@@
int config_parse(const char *filename, const char* const * sections, const Confi
if (!(f = fopen(filename, "re"))) {
r = -errno;
if (!(f = fopen(filename, "re"))) {
r = -errno;
-
fprintf(stderr, "Failed to open configuration file '%s': %s\n
", filename, strerror(-r));
+
log_error("Failed to open configuration file '%s': %s
", filename, strerror(-r));
goto finish;
}
goto finish;
}
@@
-185,7
+186,7
@@
int config_parse(const char *filename, const char* const * sections, const Confi
break;
r = -errno;
break;
r = -errno;
-
fprintf(stderr, "Failed to read configuration file '%s': %s\n
", filename, strerror(-r));
+
log_error("Failed to read configuration file '%s': %s
", filename, strerror(-r));
goto finish;
}
goto finish;
}
@@
-222,7
+223,7
@@
int config_parse_int(
assert(data);
if ((r = safe_atoi(rvalue, i)) < 0) {
assert(data);
if ((r = safe_atoi(rvalue, i)) < 0) {
-
fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s\n
", filename, line, rvalue);
+
log_error("[%s:%u] Failed to parse numeric value: %s
", filename, line, rvalue);
return r;
}
return r;
}
@@
-247,7
+248,7
@@
int config_parse_unsigned(
assert(data);
if ((r = safe_atou(rvalue, u)) < 0) {
assert(data);
if ((r = safe_atou(rvalue, u)) < 0) {
-
fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s\n
", filename, line, rvalue);
+
log_error("[%s:%u] Failed to parse numeric value: %s
", filename, line, rvalue);
return r;
}
return r;
}
@@
-273,7
+274,7
@@
int config_parse_size(
assert(data);
if ((r = safe_atou(rvalue, &u)) < 0) {
assert(data);
if ((r = safe_atou(rvalue, &u)) < 0) {
-
fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s\n
", filename, line, rvalue);
+
log_error("[%s:%u] Failed to parse numeric value: %s
", filename, line, rvalue);
return r;
}
return r;
}
@@
-299,7
+300,7
@@
int config_parse_bool(
assert(data);
if ((k = parse_boolean(rvalue)) < 0) {
assert(data);
if ((k = parse_boolean(rvalue)) < 0) {
-
fprintf(stderr, "[%s:%u] Failed to parse boolean value: %s\n
", filename, line, rvalue);
+
log_error("[%s:%u] Failed to parse boolean value: %s
", filename, line, rvalue);
return k;
}
return k;
}