chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: untabify
[elogind.git]
/
src
/
shared
/
conf-parser.c
diff --git
a/src/shared/conf-parser.c
b/src/shared/conf-parser.c
index 6bd9d9ebf74476572b6cb378ac57f1c2915b9e4a..0b1af6c577f6d65ca0a918a9f3b46a81247cb4c3 100644
(file)
--- a/
src/shared/conf-parser.c
+++ b/
src/shared/conf-parser.c
@@
-61,22
+61,22
@@
int log_syntax_internal(
if (unit)
r = log_struct_internal(level,
if (unit)
r = log_struct_internal(level,
- error
> 0 ? error : EINVAL
,
+ error,
file, line, func,
getpid() == 1 ? "UNIT=%s" : "USER_UNIT=%s", unit,
file, line, func,
getpid() == 1 ? "UNIT=%s" : "USER_UNIT=%s", unit,
- MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
+
LOG_
MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
"CONFIG_FILE=%s", config_file,
"CONFIG_LINE=%u", config_line,
"CONFIG_FILE=%s", config_file,
"CONFIG_LINE=%u", config_line,
-
"MESSAGE=[%s:%u] %s", config_file, config_line, msg
,
+
LOG_MESSAGE("[%s:%u] %s", config_file, config_line, msg)
,
NULL);
else
r = log_struct_internal(level,
NULL);
else
r = log_struct_internal(level,
- error
> 0 ? error : EINVAL
,
+ error,
file, line, func,
file, line, func,
- MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
+
LOG_
MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
"CONFIG_FILE=%s", config_file,
"CONFIG_LINE=%u", config_line,
"CONFIG_FILE=%s", config_file,
"CONFIG_LINE=%u", config_line,
-
"MESSAGE=[%s:%u] %s", config_file, config_line, msg
,
+
LOG_MESSAGE("[%s:%u] %s", config_file, config_line, msg)
,
NULL);
return r;
NULL);
return r;
@@
-367,7
+367,7
@@
int config_parse(const char *unit,
if (feof(f))
break;
if (feof(f))
break;
- log_error
(
"Failed to read configuration file '%s': %m", filename);
+ log_error
_errno(errno,
"Failed to read configuration file '%s': %m", filename);
return -errno;
}
return -errno;
}
@@
-428,8
+428,8
@@
int config_parse(const char *unit,
if (r < 0) {
if (warn)
if (r < 0) {
if (warn)
- log_warning
("Failed to parse file '%s': %s
",
-
filename, strerror(-r)
);
+ log_warning
_errno(r, "Failed to parse file '%s': %m
",
+
filename
);
return r;
}
}
return r;
}
}
@@
-823,8
+823,7
@@
int config_parse_log_facility(
x = log_facility_unshifted_from_string(rvalue);
if (x < 0) {
x = log_facility_unshifted_from_string(rvalue);
if (x < 0) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "Failed to parse log facility, ignoring: %s", rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Failed to parse log facility, ignoring: %s", rvalue);
return 0;
}
return 0;
}
@@
-855,8
+854,7
@@
int config_parse_log_level(
x = log_level_from_string(rvalue);
if (x < 0) {
x = log_level_from_string(rvalue);
if (x < 0) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "Failed to parse log level, ignoring: %s", rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Failed to parse log level, ignoring: %s", rvalue);
return 0;
}
return 0;
}