diff options
| author | David Tardon <dtardon@redhat.com> | 2022-08-09 14:35:15 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2022-09-13 08:13:27 +0200 |
| commit | 995340074e554b4bf4a0fdb0cb7436692c5a4ffd (patch) | |
| tree | ca3ee001db3e608ee80478f42fea9c3b409f1b7b /src/login/logind-user-dbus.c | |
| parent | 6d64cb0625691e2b9eda8babe07ac8281f9467ee (diff) | |
| download | systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.gz | |
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/login/logind-user-dbus.c')
| -rw-r--r-- | src/login/logind-user-dbus.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c index 67b6556d7d..88649b2f4b 100644 --- a/src/login/logind-user-dbus.c +++ b/src/login/logind-user-dbus.c @@ -26,11 +26,10 @@ static int property_get_uid( void *userdata, sd_bus_error *error) { - User *u = userdata; + User *u = ASSERT_PTR(userdata); assert(bus); assert(reply); - assert(u); return sd_bus_message_append(reply, "u", (uint32_t) u->user_record->uid); } @@ -44,11 +43,10 @@ static int property_get_gid( void *userdata, sd_bus_error *error) { - User *u = userdata; + User *u = ASSERT_PTR(userdata); assert(bus); assert(reply); - assert(u); return sd_bus_message_append(reply, "u", (uint32_t) u->user_record->gid); } @@ -62,11 +60,10 @@ static int property_get_name( void *userdata, sd_bus_error *error) { - User *u = userdata; + User *u = ASSERT_PTR(userdata); assert(bus); assert(reply); - assert(u); return sd_bus_message_append(reply, "s", u->user_record->user_name); } @@ -83,11 +80,10 @@ static int property_get_display( sd_bus_error *error) { _cleanup_free_ char *p = NULL; - User *u = userdata; + User *u = ASSERT_PTR(userdata); assert(bus); assert(reply); - assert(u); p = u->display ? session_bus_path(u->display) : strdup("/"); if (!p) @@ -105,12 +101,11 @@ static int property_get_sessions( void *userdata, sd_bus_error *error) { - User *u = userdata; + User *u = ASSERT_PTR(userdata); int r; assert(bus); assert(reply); - assert(u); r = sd_bus_message_open_container(reply, 'a', "(so)"); if (r < 0) @@ -141,11 +136,10 @@ static int property_get_idle_hint( void *userdata, sd_bus_error *error) { - User *u = userdata; + User *u = ASSERT_PTR(userdata); assert(bus); assert(reply); - assert(u); return sd_bus_message_append(reply, "b", user_get_idle_hint(u, NULL) > 0); } @@ -159,13 +153,12 @@ static int property_get_idle_since_hint( void *userdata, sd_bus_error *error) { - User *u = userdata; + User *u = ASSERT_PTR(userdata); dual_timestamp t = DUAL_TIMESTAMP_NULL; uint64_t k; assert(bus); assert(reply); - assert(u); (void) user_get_idle_hint(u, &t); k = streq(property, "IdleSinceHint") ? t.realtime : t.monotonic; @@ -182,12 +175,11 @@ static int property_get_linger( void *userdata, sd_bus_error *error) { - User *u = userdata; + User *u = ASSERT_PTR(userdata); int r; assert(bus); assert(reply); - assert(u); r = user_check_linger_file(u); @@ -195,11 +187,10 @@ static int property_get_linger( } int bus_user_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error) { - User *u = userdata; + User *u = ASSERT_PTR(userdata); int r; assert(message); - assert(u); r = bus_verify_polkit_async( message, @@ -223,12 +214,11 @@ int bus_user_method_terminate(sd_bus_message *message, void *userdata, sd_bus_er } int bus_user_method_kill(sd_bus_message *message, void *userdata, sd_bus_error *error) { - User *u = userdata; + User *u = ASSERT_PTR(userdata); int32_t signo; int r; assert(message); - assert(u); r = bus_verify_polkit_async( message, @@ -259,7 +249,7 @@ int bus_user_method_kill(sd_bus_message *message, void *userdata, sd_bus_error * } static int user_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) { - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); uid_t uid; User *user; int r; @@ -268,7 +258,6 @@ static int user_object_find(sd_bus *bus, const char *path, const char *interface assert(path); assert(interface); assert(found); - assert(m); if (streq(path, "/org/freedesktop/login1/user/self")) { sd_bus_message *message; |