diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2013-09-18 01:00:02 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-09-17 19:08:51 -0400 |
| commit | 831dedef66dbf2650a9dc41263e624fe08f3bb7a (patch) | |
| tree | 6ddb84586b43460eba6930ae596217aa9850466b /src/login/logind-session-device.c | |
| parent | 3db604b907323b8df0fc810216f6112056d26a02 (diff) | |
logind: fix build for ARM with sizeof(dev_t) > sizeof(void*)
Unfortunately on ARM-32 systems dev_t can be 64bit and thus we cannot
store it easily in void* keys for hashtables. Fix that by passing a
pointer to the dev_t variable instead.
Diffstat (limited to 'src/login/logind-session-device.c')
| -rw-r--r-- | src/login/logind-session-device.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index e92bb54fff..b45f9ebe0c 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -369,9 +369,7 @@ int session_device_new(Session *s, dev_t dev, SessionDevice **out) { if (r < 0) goto error; - assert_cc(sizeof(unsigned long) >= sizeof(dev_t)); - - r = hashmap_put(s->devices, ULONG_TO_PTR((unsigned long)sd->dev), sd); + r = hashmap_put(s->devices, &sd->dev, sd); if (r < 0) { r = -ENOMEM; goto error; @@ -392,7 +390,7 @@ int session_device_new(Session *s, dev_t dev, SessionDevice **out) { return 0; error: - hashmap_remove(s->devices, ULONG_TO_PTR((unsigned long)sd->dev)); + hashmap_remove(s->devices, &sd->dev); free(sd->node); free(sd); return r; @@ -407,7 +405,7 @@ void session_device_free(SessionDevice *sd) { LIST_REMOVE(SessionDevice, sd_by_device, sd->device->session_devices, sd); - hashmap_remove(sd->session->devices, ULONG_TO_PTR((unsigned long)sd->dev)); + hashmap_remove(sd->session->devices, &sd->dev); free(sd->node); free(sd); |