diff options
author | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 11:58:34 +0100 |
---|---|---|
committer | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 12:04:41 +0100 |
commit | 0a1beeb64207eaa88ab9236787b1cbc2f704ae14 (patch) | |
tree | 50117277be2e2078d0373b944a30b4f09bb94443 /src/rfkill/rfkill.c | |
parent | b4d23205f238e06aaa31264628e20669e714acad (diff) |
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().
Diffstat (limited to 'src/rfkill/rfkill.c')
-rw-r--r-- | src/rfkill/rfkill.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c index c7c659292a..0acb092418 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -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; } |