summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-02-24 02:33:57 +0100
committerLennart Poettering <lennart@poettering.net>2011-02-24 02:33:57 +0100
commitccc80078fe47395ffe0dd48cb6c81551d991ef4b (patch)
treebbb42e44b4ed74b39f7be2e12053bea81cc0505e /src
parentaa2e2115873e102b8f6701f4211ddf7bec4c5e10 (diff)
general: unify error code we generate on timeout
Diffstat (limited to 'src')
-rw-r--r--src/ask-password-api.c2
-rw-r--r--src/dbus.c1
-rw-r--r--src/tty-ask-password-agent.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/src/ask-password-api.c b/src/ask-password-api.c
index 845517a690..f43075e601 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 d7b80ba01d..64988c7ccc 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 14b01486bd..5e745247e5 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;
}