logind: trivial simplification

[elogind.git] / src / login / logind-session-device.c

diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index 656f268dba4eae34440005ec6a870359e7fb2608..6c65607b9fd9fd0808140af50f793162446bf86f 100644 (file)
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-

 /***
   This file is part of systemd.
 
 /***
   This file is part of systemd.
 


@@ -20,16 +18,23 @@
 ***/
 
 #include <fcntl.h>
 ***/
 
 #include <fcntl.h>

-#include <libudev.h>

 #include <linux/input.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
 #include <linux/input.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 

-#include "util.h"
-#include "missing.h"
+#if 0 /// elogind needs the systems udev header
+#include "libudev.h"
+#else
+#include <libudev.h>
+#endif // 0
+
+#include "alloc-util.h"

 #include "bus-util.h"
 #include "bus-util.h"

+#include "fd-util.h"

 #include "logind-session-device.h"
 #include "logind-session-device.h"

+#include "missing.h"
+#include "util.h"

 
 enum SessionDeviceNotifications {
         SESSION_DEVICE_RESUME,
 
 enum SessionDeviceNotifications {
         SESSION_DEVICE_RESUME,


@@ -39,7 +44,7 @@ enum SessionDeviceNotifications {
 };
 
 static int session_device_notify(SessionDevice *sd, enum SessionDeviceNotifications type) {
 };
 
 static int session_device_notify(SessionDevice *sd, enum SessionDeviceNotifications type) {

-        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;

         _cleanup_free_ char *path = NULL;
         const char *t = NULL;
         uint32_t major, minor;
         _cleanup_free_ char *path = NULL;
         const char *t = NULL;
         uint32_t major, minor;