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:
+5
-5
@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
r = mkdir_p("/var/lib/systemd/rfkill", 0755);
|
||||
if (r < 0) {
|
||||
log_error("Failed to create rfkill directory: %s", strerror(-r));
|
||||
log_error_errno(-r, "Failed to create rfkill directory: %m");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
@@ -107,13 +107,13 @@ int main(int argc, char *argv[]) {
|
||||
if (r == -ENOENT)
|
||||
return EXIT_SUCCESS;
|
||||
|
||||
log_error("Failed to read %s: %s", saved, strerror(-r));
|
||||
log_error_errno(-r, "Failed to read %s: %m", saved);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
r = udev_device_set_sysattr_value(device, "soft", value);
|
||||
if (r < 0) {
|
||||
log_error("Failed to write system attribute: %s", strerror(-r));
|
||||
log_error_errno(-r, "Failed to write system attribute: %m");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
@@ -122,13 +122,13 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
value = udev_device_get_sysattr_value(device, "soft");
|
||||
if (!value) {
|
||||
log_error("Failed to read system attribute: %s", strerror(-r));
|
||||
log_error_errno(-r, "Failed to read system attribute: %m");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
r = write_string_file(saved, value);
|
||||
if (r < 0) {
|
||||
log_error("Failed to write %s: %s", saved, strerror(-r));
|
||||
log_error_errno(-r, "Failed to write %s: %m", saved);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user