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);
}
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);
}
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);
}
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)
void *userdata,
sd_bus_error *error) {
- User *u = userdata;
- Session *session;
+ 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)
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);
}
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;
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);
}
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,
}
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,
}
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;
assert(path);
assert(interface);
assert(found);
- assert(m);
if (streq(path, "/org/freedesktop/login1/user/self")) {
sd_bus_message *message;
SD_BUS_PROPERTY("Linger", "b", property_get_linger, 0, 0),
SD_BUS_METHOD("Terminate", NULL, NULL, bus_user_method_terminate, SD_BUS_VTABLE_UNPRIVILEGED),
- SD_BUS_METHOD_WITH_NAMES("Kill",
- "i",
- SD_BUS_PARAM(signal_number),
- NULL,,
- bus_user_method_kill,
- SD_BUS_VTABLE_UNPRIVILEGED),
+ SD_BUS_METHOD_WITH_ARGS("Kill",
+ SD_BUS_ARGS("i", signal_number),
+ SD_BUS_NO_RESULT,
+ bus_user_method_kill,
+ SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_VTABLE_END
};