chiark / gitweb /
tree-wide: make the Subscribe() method calls asynchronous too
authorLennart Poettering <lennart@poettering.net>
Wed, 20 Dec 2017 15:40:47 +0000 (16:40 +0100)
committerSven Eden <yamakuzure@gmx.net>
Wed, 30 May 2018 05:50:00 +0000 (07:50 +0200)
src/login/logind.c

index 2f7243ba2cbadc02e159c917288857333bb132df..0238cd889b95702cf45f382f4cc0a510754087ee 100644 (file)
@@ -688,7 +688,6 @@ static int manager_reserve_vt(Manager *m) {
 #endif // 0
 
 static int manager_connect_bus(Manager *m) {
-        _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         int r;
 
         assert(m);
@@ -771,19 +770,18 @@ static int manager_connect_bus(Manager *m) {
         if (r < 0)
                 return log_error_errno(r, "Failed to request match for Reloading: %m");
 
-        r = sd_bus_call_method(
+        r = sd_bus_call_method_async(
                         m->bus,
+                        NULL,
                         "org.freedesktop.systemd1",
                         "/org/freedesktop/systemd1",
                         "org.freedesktop.systemd1.Manager",
                         "Subscribe",
-                        &error,
-                        NULL, NULL);
-        if (r < 0) {
-                log_error("Failed to enable subscription: %s", bus_error_message(&error, r));
-                return r;
-        }
 #endif // 0
+                        NULL, NULL,
+                        NULL);
+        if (r < 0)
+                return log_error_errno(r, "Failed to enable subscription: %m");
 
         r = sd_bus_request_name_async(m->bus, NULL, "org.freedesktop.login1", 0, NULL, NULL);
         if (r < 0)