X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=b7c8f71a52a3d362b6bae01ddb089757caccaef5;hp=29f527259b0477c512f66e61dea798d907b6f862;hb=ec202eae8e84a4c99f054f771cb832046cb8769f;hpb=d90bb66996f5e3e9b6987e60980ff721b6fc2aff

diff --git a/src/login/logind.c b/src/login/logind.c
index 29f527259..b7c8f71a5 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -34,6 +34,7 @@
 #include "bus-util.h"
 #include "bus-error.h"
 #include "logind.h"
+#include "udev-util.h"
 
 Manager *manager_new(void) {
         Manager *m;
@@ -490,9 +491,8 @@ static int manager_enumerate_inhibitors(Manager *m) {
 }
 
 static int manager_dispatch_seat_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+        _cleanup_udev_device_unref_ struct udev_device *d = NULL;
         Manager *m = userdata;
-        struct udev_device *d;
-        int r;
 
         assert(m);
 
@@ -500,16 +500,13 @@ static int manager_dispatch_seat_udev(sd_event_source *s, int fd, uint32_t reven
         if (!d)
                 return -ENOMEM;
 
-        r = manager_process_seat_device(m, d);
-        udev_device_unref(d);
-
-        return r;
+        manager_process_seat_device(m, d);
+        return 0;
 }
 
 static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+        _cleanup_udev_device_unref_ struct udev_device *d = NULL;
         Manager *m = userdata;
-        struct udev_device *d;
-        int r;
 
         assert(m);
 
@@ -517,16 +514,13 @@ static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t rev
         if (!d)
                 return -ENOMEM;
 
-        r = manager_process_seat_device(m, d);
-        udev_device_unref(d);
-
-        return r;
+        manager_process_seat_device(m, d);
+        return 0;
 }
 
 static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+        _cleanup_udev_device_unref_ struct udev_device *d = NULL;
         Manager *m = userdata;
-        struct udev_device *d;
-        int r = 0;
         const char *name;
 
         assert(m);
@@ -541,17 +535,14 @@ static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t reven
          * VTs, to make sure our auto VTs never go away. */
 
         if (name && startswith(name, "vcsa") && streq_ptr(udev_device_get_action(d), "remove"))
-                r = seat_preallocate_vts(m->seat0);
+                seat_preallocate_vts(m->seat0);
 
-        udev_device_unref(d);
-
-        return r;
+        return 0;
 }
 
 static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+        _cleanup_udev_device_unref_ struct udev_device *d = NULL;
         Manager *m = userdata;
-        struct udev_device *d;
-        int r;
 
         assert(m);
 
@@ -559,10 +550,8 @@ static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t rev
         if (!d)
                 return -ENOMEM;
 
-        r = manager_process_button_device(m, d);
-        udev_device_unref(d);
-
-        return r;
+        manager_process_button_device(m, d);
+        return 0;
 }
 
 static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
@@ -573,7 +562,6 @@ static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents
         assert(m->console_active_fd == fd);
 
         seat_read_active_vt(m->seat0);
-
         return 0;
 }
 
@@ -727,7 +715,7 @@ static int manager_connect_bus(Manager *m) {
                 return r;
         }
 
-        r = sd_bus_request_name(m->bus, "org.freedesktop.login1", SD_BUS_NAME_REPLACE_EXISTING);
+        r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0);
         if (r < 0) {
                 log_error("Failed to register name: %s", strerror(-r));
                 return r;