chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: unify how we cast between uid_t and pointers for hashmap keys
[elogind.git]
/
src
/
login
/
logind-core.c
diff --git
a/src/login/logind-core.c
b/src/login/logind-core.c
index 0f4ac9fb81a82666ea00a0b36aa06343ff537686..a6ff5add95910000709460b82b779a2299e394fc 100644
(file)
--- a/
src/login/logind-core.c
+++ b/
src/login/logind-core.c
@@
-101,7
+101,7
@@
int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User **
assert(m);
assert(name);
assert(m);
assert(name);
- u = hashmap_get(m->users, U
LONG_TO_PTR((unsigned long)
uid));
+ u = hashmap_get(m->users, U
ID_TO_PTR(
uid));
if (!u) {
u = user_new(m, uid, gid, name);
if (!u)
if (!u) {
u = user_new(m, uid, gid, name);
if (!u)
@@
-551,7
+551,7
@@
bool manager_is_docked_or_multiple_displays(Manager *m) {
* assume that we are docked. */
n = manager_count_displays(m);
if (n < 0)
* assume that we are docked. */
n = manager_count_displays(m);
if (n < 0)
- log_warning_errno(
-
n, "Display counting failed: %m");
+ log_warning_errno(n, "Display counting failed: %m");
else if (n > 1) {
log_debug("Multiple (%i) displays connected.", n);
return true;
else if (n > 1) {
log_debug("Multiple (%i) displays connected.", n);
return true;