From ccc80078fe47395ffe0dd48cb6c81551d991ef4b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 24 Feb 2011 02:33:57 +0100 Subject: [PATCH] general: unify error code we generate on timeout --- src/ask-password-api.c | 2 +- src/dbus.c | 1 + src/tty-ask-password-agent.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ask-password-api.c b/src/ask-password-api.c index 845517a6..f43075e6 100644 --- a/src/ask-password-api.c +++ b/src/ask-password-api.c @@ -132,7 +132,7 @@ int ask_password_tty( r = -errno; goto finish; } else if (k == 0) { - r = -ETIMEDOUT; + r = -ETIME; goto finish; } diff --git a/src/dbus.c b/src/dbus.c index d7b80ba0..64988c7c 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -1361,6 +1361,7 @@ static const char *error_to_dbus(int error) { return DBUS_ERROR_FILE_EXISTS; case -ETIMEDOUT: + case -ETIME: return DBUS_ERROR_TIMEOUT; case -EIO: diff --git a/src/tty-ask-password-agent.c b/src/tty-ask-password-agent.c index 14b01486..5e745247 100644 --- a/src/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent.c @@ -128,7 +128,7 @@ static int ask_password_plymouth( y = now(CLOCK_MONOTONIC); if (y > until) { - r = -ETIMEDOUT; + r = -ETIME; goto finish; } @@ -149,7 +149,7 @@ static int ask_password_plymouth( r = -errno; goto finish; } else if (j == 0) { - r = -ETIMEDOUT; + r = -ETIME; goto finish; } -- 2.39.5