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/tty-ask-password-agent/tty-ask-password-agent.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/tty-ask-password-agent/tty-ask-password-agent.c')
-rw-r--r-- | src/tty-ask-password-agent/tty-ask-password-agent.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c index e6dc84b440..70ad3cb1ac 100644 --- a/src/tty-ask-password-agent/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent/tty-ask-password-agent.c @@ -339,7 +339,7 @@ static int parse_password(const char *filename, char **wall) { return 0; if (r < 0) { - log_error("Failed to query password: %s", strerror(-r)); + log_error_errno(-r, "Failed to query password: %m"); return r; } @@ -504,7 +504,7 @@ static int watch_passwords(void) { for (;;) { r = show_passwords(); if (r < 0) - log_error("Failed to show password: %s", strerror(-r)); + log_error_errno(-r, "Failed to show password: %m"); if (poll(pollfd, _FD_MAX, -1) < 0) { if (errno == EINTR) @@ -642,7 +642,7 @@ int main(int argc, char *argv[]) { r = show_passwords(); if (r < 0) - log_error("Error: %s", strerror(-r)); + log_error_errno(-r, "Error: %m"); finish: return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; |