libudev: always return valid negative error codes on API functions

[elogind.git] / src / libsystemd-bus / bus-util.c

diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index 3dd208d0c1cfb22ddaf76e357e48a1bb9d489547..ed6fdc473ae705c2ca56f639aefd3c7eb49b8af7 100644 (file)
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd-bus/bus-util.c
@@ -25,6 +25,7 @@
 #include "strv.h"
 #include "macro.h"
 #include "def.h"
+#include "missing.h"
 
 #include "sd-event.h"
 #include "sd-bus.h"
@@ -235,7 +236,7 @@ static void async_polkit_query_free(sd_bus *b, AsyncPolkitQuery *q) {
                 return;
 
         if (q->serial >  0 && b)
-                sd_bus_send_with_reply_cancel(b, q->serial);
+                sd_bus_call_async_cancel(b, q->serial);
 
         sd_bus_message_unref(q->request);
         sd_bus_message_unref(q->reply);
@@ -361,7 +362,7 @@ int bus_verify_polkit_async(
                 return r;
         }
 
-        r = sd_bus_send_with_reply(bus, pk, async_polkit_callback, q, 0, &q->serial);
+        r = sd_bus_call_async(bus, pk, async_polkit_callback, q, 0, &q->serial);
         if (r < 0)
                 return r;
 
@@ -918,7 +919,7 @@ int bus_map_all_properties(sd_bus *bus,
                 } else {
                         r = sd_bus_message_skip(m, "v");
                         if (r < 0)
-                                return -r;
+                                return r;
                 }
 
                 r = sd_bus_message_exit_container(m);
@@ -943,9 +944,9 @@ int bus_open_transport(BusTransport transport, const char *host, bool user, sd_b
 
         case BUS_TRANSPORT_LOCAL:
                 if (user)
-                        r = sd_bus_open_user(bus);
+                        r = sd_bus_default_user(bus);
                 else
-                        r = sd_bus_open_system(bus);
+                        r = sd_bus_default_system(bus);
 
                 break;