chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6d99330
)
bus: properly return an error when we detect a method call timeout
author
Lennart Poettering
<lennart@poettering.net>
Thu, 12 Dec 2013 04:29:56 +0000
(
05:29
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 12 Dec 2013 04:40:05 +0000
(
05:40
+0100)
src/libsystemd-bus/sd-bus.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-bus/sd-bus.c
b/src/libsystemd-bus/sd-bus.c
index edd917e30375786811727fd44590625e99ce3df1..37408cf7b4e3007dfac882e496dbcc703f97d320 100644
(file)
--- a/
src/libsystemd-bus/sd-bus.c
+++ b/
src/libsystemd-bus/sd-bus.c
@@
-1754,6
+1754,8
@@
_public_ int sd_bus_call(
r = bus_poll(bus, true, left);
if (r < 0)
return r;
r = bus_poll(bus, true, left);
if (r < 0)
return r;
+ if (r == 0)
+ return -ETIMEDOUT;
r = dispatch_wqueue(bus);
if (r < 0) {
r = dispatch_wqueue(bus);
if (r < 0) {