summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRonny Chevalier <chevalier.ronny@gmail.com>2016-02-29 12:23:55 +0100
committerRonny Chevalier <chevalier.ronny@gmail.com>2016-02-29 12:23:55 +0100
commit3113d885fe7a64a06701e2da2053638c98d944ad (patch)
treeca8b72ca28bbe274dd4e57db0bfbba5dda57d4a3 /src
parent5df2b16d4bf03ac3f3f5cf6f91d5490cab4681d6 (diff)
parent20268e0c3e2bbba4160e444f23be83da4542e0f5 (diff)
Merge pull request #2764 from benjarobin/fix-stdio-bridge
stdio-bridge: Correctly propagate error
Diffstat (limited to 'src')
-rw-r--r--src/stdio-bridge/stdio-bridge.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
index 85b99ce161..ce8efce3d5 100644
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -234,12 +234,14 @@ int main(int argc, char *argv[]) {
fd = sd_bus_get_fd(a);
if (fd < 0) {
+ r = fd;
log_error_errno(r, "Failed to get fd: %m");
goto finish;
}
events_a = sd_bus_get_events(a);
if (events_a < 0) {
+ r = events_a;
log_error_errno(r, "Failed to get events mask: %m");
goto finish;
}
@@ -252,6 +254,7 @@ int main(int argc, char *argv[]) {
events_b = sd_bus_get_events(b);
if (events_b < 0) {
+ r = events_b;
log_error_errno(r, "Failed to get events mask: %m");
goto finish;
}