diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-12-14 22:18:49 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-12-14 22:45:14 -0500 |
| commit | 5958d08962a11950287bc7eaa4094a9c15c798d1 (patch) | |
| tree | c17fc09a6875274cde5e50f9477f88f22c30f88e | |
| parent | 899839b9f87a46b49bb3f0eccb9133a8b07c1be7 (diff) | |
bus: return negative errno on error
https://bugs.freedesktop.org/show_bug.cgi?id=72688
| -rw-r--r-- | src/libsystemd-bus/bus-objects.c | 8 | ||||
| -rw-r--r-- | src/libsystemd-bus/bus-util.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c index 204e21d5d8..8c81ea6641 100644 --- a/src/libsystemd-bus/bus-objects.c +++ b/src/libsystemd-bus/bus-objects.c @@ -51,7 +51,7 @@ static int node_vtable_get_userdata( if (r < 0) return r; if (sd_bus_error_is_set(error)) - return sd_bus_error_get_errno(error); + return -sd_bus_error_get_errno(error); if (r == 0) return r; } @@ -117,7 +117,7 @@ static int add_enumerated_to_set( if (r < 0) return r; if (sd_bus_error_is_set(error)) - return sd_bus_error_get_errno(error); + return -sd_bus_error_get_errno(error); STRV_FOREACH(k, children) { if (r < 0) { @@ -419,7 +419,7 @@ static int invoke_property_get( if (r < 0) return r; if (sd_bus_error_is_set(error)) - return sd_bus_error_get_errno(error); + return -sd_bus_error_get_errno(error); return r; } @@ -475,7 +475,7 @@ static int invoke_property_set( if (r < 0) return r; if (sd_bus_error_is_set(error)) - return sd_bus_error_get_errno(error); + return -sd_bus_error_get_errno(error); return r; } diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c index 30ee67e850..da4668b86f 100644 --- a/src/libsystemd-bus/bus-util.c +++ b/src/libsystemd-bus/bus-util.c @@ -328,7 +328,7 @@ int bus_verify_polkit_async( if (sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN)) return -EACCES; - return sd_bus_error_get_errno(e); + return -sd_bus_error_get_errno(e); } r = sd_bus_message_enter_container(q->reply, 'r', "bba{ss}"); |