diff options
Diffstat (limited to 'src/login/logind-seat-dbus.c')
| -rw-r--r-- | src/login/logind-seat-dbus.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c index cd20693cbe..03a419229e 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/login/logind-seat-dbus.c @@ -33,11 +33,10 @@ static int property_get_active_session( sd_bus_error *error) { _cleanup_free_ char *p = NULL; - Seat *s = userdata; + Seat *s = ASSERT_PTR(userdata); assert(bus); assert(reply); - assert(s); p = s->active ? session_bus_path(s->active) : strdup("/"); if (!p) @@ -55,12 +54,11 @@ static int property_get_sessions( void *userdata, sd_bus_error *error) { - Seat *s = userdata; + Seat *s = ASSERT_PTR(userdata); int r; assert(bus); assert(reply); - assert(s); r = sd_bus_message_open_container(reply, 'a', "(so)"); if (r < 0) @@ -95,11 +93,10 @@ static int property_get_idle_hint( void *userdata, sd_bus_error *error) { - Seat *s = userdata; + Seat *s = ASSERT_PTR(userdata); assert(bus); assert(reply); - assert(s); return sd_bus_message_append(reply, "b", seat_get_idle_hint(s, NULL) > 0); } @@ -113,14 +110,13 @@ static int property_get_idle_since_hint( void *userdata, sd_bus_error *error) { - Seat *s = userdata; + Seat *s = ASSERT_PTR(userdata); dual_timestamp t; uint64_t u; int r; assert(bus); assert(reply); - assert(s); r = seat_get_idle_hint(s, &t); if (r < 0) @@ -132,11 +128,10 @@ static int property_get_idle_since_hint( } int bus_seat_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error) { - Seat *s = userdata; + Seat *s = ASSERT_PTR(userdata); int r; assert(message); - assert(s); r = bus_verify_polkit_async( message, @@ -160,13 +155,12 @@ int bus_seat_method_terminate(sd_bus_message *message, void *userdata, sd_bus_er } static int method_activate_session(sd_bus_message *message, void *userdata, sd_bus_error *error) { - Seat *s = userdata; + Seat *s = ASSERT_PTR(userdata); const char *name; Session *session; int r; assert(message); - assert(s); r = sd_bus_message_read(message, "s", &name); if (r < 0) @@ -193,12 +187,11 @@ static int method_activate_session(sd_bus_message *message, void *userdata, sd_b } static int method_switch_to(sd_bus_message *message, void *userdata, sd_bus_error *error) { - Seat *s = userdata; + Seat *s = ASSERT_PTR(userdata); unsigned to; int r; assert(message); - assert(s); r = sd_bus_message_read(message, "u", &to); if (r < 0) @@ -221,11 +214,10 @@ static int method_switch_to(sd_bus_message *message, void *userdata, sd_bus_erro } static int method_switch_to_next(sd_bus_message *message, void *userdata, sd_bus_error *error) { - Seat *s = userdata; + Seat *s = ASSERT_PTR(userdata); int r; assert(message); - assert(s); r = check_polkit_chvt(message, s->manager, error); if (r < 0) @@ -241,11 +233,10 @@ static int method_switch_to_next(sd_bus_message *message, void *userdata, sd_bus } static int method_switch_to_previous(sd_bus_message *message, void *userdata, sd_bus_error *error) { - Seat *s = userdata; + Seat *s = ASSERT_PTR(userdata); int r; assert(message); - assert(s); r = check_polkit_chvt(message, s->manager, error); if (r < 0) @@ -263,7 +254,7 @@ static int method_switch_to_previous(sd_bus_message *message, void *userdata, sd static int seat_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) { _cleanup_free_ char *e = NULL; sd_bus_message *message; - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); const char *p; Seat *seat; int r; @@ -272,7 +263,6 @@ static int seat_object_find(sd_bus *bus, const char *path, const char *interface assert(path); assert(interface); assert(found); - assert(m); p = startswith(path, "/org/freedesktop/login1/seat/"); if (!p) |