treewide: auto-convert the simple cases to log_*_errno()
As a followup to 086891e5c1 "log: add an "error" parameter to all
low-level logging calls and intrdouce log_error_errno() as log calls
that take error numbers", use sed to convert the simple cases to use
the new macros:
find . -name '*.[ch]' | xargs sed -r -i -e \
's/log_(debug|info|notice|warning|error|emergency)\("(.*)%s"(.*), strerror\(-([a-zA-Z_]+)\)\);/log_\1_errno(-\4, "\2%m"\3);/'
Multi-line log_*() invocations are not covered.
And we also should add log_unit_*_errno().
This commit is contained in:
@@ -255,7 +255,7 @@ static int create_disk(
|
||||
"# Automatically generated by systemd-cryptsetup-generator \n\n"
|
||||
"[Unit]\nJobTimeoutSec=0");
|
||||
if (r < 0) {
|
||||
log_error("Failed to write device drop-in: %s", strerror(-r));
|
||||
log_error_errno(-r, "Failed to write device drop-in: %m");
|
||||
return r;
|
||||
}
|
||||
}
|
||||
@@ -327,7 +327,7 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
z = parse_proc_cmdline(parse_proc_cmdline_item);
|
||||
if (z < 0)
|
||||
log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-z));
|
||||
log_warning_errno(-z, "Failed to parse kernel command line, ignoring: %m");
|
||||
|
||||
if (!arg_enabled) {
|
||||
r = r2 = EXIT_SUCCESS;
|
||||
|
||||
Reference in New Issue
Block a user