summaryrefslogtreecommitdiff
path: root/src/core/dbus-timer.c
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2022-08-09 14:35:15 +0200
committerDavid Tardon <dtardon@redhat.com>2022-09-13 08:13:27 +0200
commit995340074e554b4bf4a0fdb0cb7436692c5a4ffd (patch)
treeca3ee001db3e608ee80478f42fea9c3b409f1b7b /src/core/dbus-timer.c
parent6d64cb0625691e2b9eda8babe07ac8281f9467ee (diff)
downloadsystemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.gz
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/core/dbus-timer.c')
-rw-r--r--src/core/dbus-timer.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index 8110fb1fb7..80dd40a16a 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -19,12 +19,11 @@ static int property_get_monotonic_timers(
void *userdata,
sd_bus_error *error) {
- Timer *t = userdata;
+ Timer *t = ASSERT_PTR(userdata);
int r;
assert(bus);
assert(reply);
- assert(t);
r = sd_bus_message_open_container(reply, 'a', "(stt)");
if (r < 0)
@@ -67,12 +66,11 @@ static int property_get_calendar_timers(
void *userdata,
sd_bus_error *error) {
- Timer *t = userdata;
+ Timer *t = ASSERT_PTR(userdata);
int r;
assert(bus);
assert(reply);
- assert(t);
r = sd_bus_message_open_container(reply, 'a', "(sst)");
if (r < 0)
@@ -105,11 +103,10 @@ static int property_get_next_elapse_monotonic(
void *userdata,
sd_bus_error *error) {
- Timer *t = userdata;
+ Timer *t = ASSERT_PTR(userdata);
assert(bus);
assert(reply);
- assert(t);
return sd_bus_message_append(reply, "t",
(uint64_t) usec_shift_clock(t->next_elapse_monotonic_or_boottime,