X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-core.c;h=e8da59a18252861127bd548b0d152588ddea5919;hp=ed7ea5da31cd9ba45aaeb6838e6b78824cd186cb;hb=2eec67acbb00593e414549a7e5b35eb7dd776b1b;hpb=3c56cab44150ad47323970cfadfb0257c6305a74

diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index ed7ea5da3..e8da59a18 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -20,16 +20,13 @@
 ***/
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <pwd.h>
-#include <unistd.h>
 #include <linux/vt.h>
 
 #include "strv.h"
 #include "cgroup-util.h"
-#include "audit.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "udev-util.h"
@@ -101,7 +98,7 @@ int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User **
         assert(m);
         assert(name);
 
-        u = hashmap_get(m->users, ULONG_TO_PTR((unsigned long) uid));
+        u = hashmap_get(m->users, UID_TO_PTR(uid));
         if (!u) {
                 u = user_new(m, uid, gid, name);
                 if (!u)
@@ -551,7 +548,7 @@ bool manager_is_docked_or_multiple_displays(Manager *m) {
          * assume that we are docked. */
         n = manager_count_displays(m);
         if (n < 0)
-                log_warning("Display counting failed: %s", strerror(-n));
+                log_warning_errno(n, "Display counting failed: %m");
         else if (n > 1) {
                 log_debug("Multiple (%i) displays connected.", n);
                 return true;