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-dbus.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-dbus.c')
| -rw-r--r-- | src/login/logind-session-dbus.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index f793f99b77..5f6bafbc6a 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -452,9 +452,7 @@ static DBusHandlerResult session_message_dispatch( return bus_send_error_reply(connection, message, &error, -EINVAL); dev = makedev(major, minor); - assert_cc(sizeof(unsigned long) >= sizeof(dev_t)); - - sd = hashmap_get(s->devices, ULONG_TO_PTR((unsigned long)dev)); + sd = hashmap_get(s->devices, &dev); if (sd) { /* We don't allow retrieving a device multiple times. * The related ReleaseDevice call is not ref-counted. @@ -487,6 +485,7 @@ static DBusHandlerResult session_message_dispatch( } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Session", "ReleaseDevice")) { SessionDevice *sd; uint32_t major, minor; + dev_t dev; if (!session_is_controller(s, bus_message_get_sender_with_fallback(message))) return bus_send_error_reply(connection, message, NULL, -EPERM); @@ -499,7 +498,8 @@ static DBusHandlerResult session_message_dispatch( DBUS_TYPE_INVALID)) return bus_send_error_reply(connection, message, &error, -EINVAL); - sd = hashmap_get(s->devices, ULONG_TO_PTR((unsigned long)makedev(major, minor))); + dev = makedev(major, minor); + sd = hashmap_get(s->devices, &dev); if (!sd) return bus_send_error_reply(connection, message, NULL, -ENODEV); @@ -512,6 +512,7 @@ static DBusHandlerResult session_message_dispatch( } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Session", "PauseDeviceComplete")) { SessionDevice *sd; uint32_t major, minor; + dev_t dev; if (!session_is_controller(s, bus_message_get_sender_with_fallback(message))) return bus_send_error_reply(connection, message, NULL, -EPERM); @@ -524,7 +525,8 @@ static DBusHandlerResult session_message_dispatch( DBUS_TYPE_INVALID)) return bus_send_error_reply(connection, message, &error, -EINVAL); - sd = hashmap_get(s->devices, ULONG_TO_PTR((unsigned long)makedev(major, minor))); + dev = makedev(major, minor); + sd = hashmap_get(s->devices, &dev); if (!sd) return bus_send_error_reply(connection, message, NULL, -ENODEV); |