chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
conf-parse: make syntax logging functions behave more like other log functons
[elogind.git]
/
src
/
shared
/
conf-parser.c
diff --git
a/src/shared/conf-parser.c
b/src/shared/conf-parser.c
index 94808fa6ce1a3a5a885ce54fcfbc817a39d6cdaf..a1a94da928470dfa2b69f7150cccb1a5ffca466c 100644
(file)
--- a/
src/shared/conf-parser.c
+++ b/
src/shared/conf-parser.c
@@
-61,7
+61,7
@@
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,
LOG_MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
file, line, func,
getpid() == 1 ? "UNIT=%s" : "USER_UNIT=%s", unit,
LOG_MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
@@
-71,7
+71,7
@@
int log_syntax_internal(
NULL);
else
r = log_struct_internal(level,
NULL);
else
r = log_struct_internal(level,
- error
> 0 ? error : EINVAL
,
+ error,
file, line, func,
LOG_MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
"CONFIG_FILE=%s", config_file,
file, line, func,
LOG_MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
"CONFIG_FILE=%s", config_file,
@@
-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;
}