X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-device.c;h=eb5edd1cd5e11d2ce8ef2731668a1e65701497ad;hp=95c2307baf04cb02cd3aa2402af84d831c11c9f8;hb=0dfdccd07d4111a70ab8c779c6b44e6dbb683d7d;hpb=118ecf32425a590ea266b5c2b6de7962bb242356

diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 95c2307ba..eb5edd1cd 100644
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
@@ -19,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <assert.h>
 #include <string.h>
 
+#include "alloc-util.h"
 #include "logind-device.h"
 #include "util.h"
 
@@ -54,20 +52,10 @@ Device* device_new(Manager *m, const char *sysfs, bool master) {
         return d;
 }
 
-void device_free(Device *d) {
-        assert(d);
-
-        device_detach(d);
-
-        hashmap_remove(d->manager->devices, d->sysfs);
-
-        free(d->sysfs);
-        free(d);
-}
-
-void device_detach(Device *d) {
+static void device_detach(Device *d) {
         Seat *s;
         SessionDevice *sd;
+
         assert(d);
 
         if (!d->seat)
@@ -77,15 +65,26 @@ void device_detach(Device *d) {
                 session_device_free(sd);
 
         s = d->seat;
-        LIST_REMOVE(Device, devices, d->seat->devices, d);
+        LIST_REMOVE(devices, d->seat->devices, d);
         d->seat = NULL;
 
         if (!seat_has_master_device(s)) {
                 seat_add_to_gc_queue(s);
-                seat_send_changed(s, "CanGraphical\0");
+                seat_send_changed(s, "CanGraphical", NULL);
         }
 }
 
+void device_free(Device *d) {
+        assert(d);
+
+        device_detach(d);
+
+        hashmap_remove(d->manager->devices, d->sysfs);
+
+        free(d->sysfs);
+        free(d);
+}
+
 void device_attach(Device *d, Seat *s) {
         Device *i;
         bool had_master;
@@ -110,16 +109,16 @@ void device_attach(Device *d, Seat *s) {
          * per seat, so we iterate only a few times. */
 
         if (d->master || !s->devices)
-                LIST_PREPEND(Device, devices, s->devices, d);
+                LIST_PREPEND(devices, s->devices, d);
         else {
                 LIST_FOREACH(devices, i, s->devices) {
                         if (!i->devices_next || !i->master) {
-                                LIST_INSERT_AFTER(Device, devices, s->devices, i, d);
+                                LIST_INSERT_AFTER(devices, s->devices, i, d);
                                 break;
                         }
                 }
         }
 
         if (!had_master && d->master)
-                seat_send_changed(s, "CanGraphical\0");
+                seat_send_changed(s, "CanGraphical", NULL);
 }