chiark / gitweb /
libudev: always return valid negative error codes on API functions
[elogind.git] / src / libsystemd-bus / bus-util.c
index d277e1e0f08ad73380124c367876f999f83ddbe1..ed6fdc473ae705c2ca56f639aefd3c7eb49b8af7 100644 (file)
@@ -919,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);
@@ -944,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;