From 5958d08962a11950287bc7eaa4094a9c15c798d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 14 Dec 2013 22:18:49 -0500 Subject: [PATCH] bus: return negative errno on error https://bugs.freedesktop.org/show_bug.cgi?id=72688 --- src/libsystemd-bus/bus-objects.c | 8 ++++---- 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 204e21d..8c81ea6 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 30ee67e..da4668b 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}"); -- 2.7.4