chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: allow spawning ephemeral nspawn containers based on the root file system...
[elogind.git]
/
src
/
shared
/
conf-parser.c
diff --git
a/src/shared/conf-parser.c
b/src/shared/conf-parser.c
index 6bd9d9ebf74476572b6cb378ac57f1c2915b9e4a..5fe983a84786b60d4171fb3d08b293a27d8bddd8 100644
(file)
--- a/
src/shared/conf-parser.c
+++ b/
src/shared/conf-parser.c
@@
-64,19
+64,19
@@
int log_syntax_internal(
error > 0 ? error : EINVAL,
file, line, func,
getpid() == 1 ? "UNIT=%s" : "USER_UNIT=%s", unit,
error > 0 ? error : EINVAL,
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,
error > 0 ? error : EINVAL,
file, line, func,
NULL);
else
r = log_struct_internal(level,
error > 0 ? error : EINVAL,
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;
}
}