diff options
Diffstat (limited to 'src/timesync')
-rw-r--r-- | src/timesync/timesyncd-bus.c | 12 | ||||
-rw-r--r-- | src/timesync/timesyncd-manager.c | 26 |
2 files changed, 11 insertions, 27 deletions
diff --git a/src/timesync/timesyncd-bus.c b/src/timesync/timesyncd-bus.c index 0eb61a3808..1c33f3fbd2 100644 --- a/src/timesync/timesyncd-bus.c +++ b/src/timesync/timesyncd-bus.c @@ -29,10 +29,9 @@ static int property_get_servers( void *userdata, sd_bus_error *error) { - ServerName **s = userdata; + ServerName **s = ASSERT_PTR(userdata); int r; - assert(s); assert(bus); assert(reply); @@ -51,10 +50,9 @@ static int property_get_servers( static int method_set_runtime_servers(sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_strv_free_ char **msg_names = NULL; - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); int r; - assert(m); assert(message); r = sd_bus_message_read_strv(message, &msg_names); @@ -106,9 +104,8 @@ static int property_get_current_server_name( void *userdata, sd_bus_error *error) { - ServerName **s = userdata; + ServerName **s = ASSERT_PTR(userdata); - assert(s); assert(bus); assert(reply); @@ -172,10 +169,9 @@ static int property_get_ntp_message( void *userdata, sd_bus_error *error) { - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); int r; - assert(m); assert(reply); r = sd_bus_message_open_container(reply, 'r', "uuuuittayttttbtt"); diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 2de24cf0b7..49eb228318 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -86,9 +86,8 @@ static uint32_t graceful_add_offset_1900_1970(time_t t) { static int manager_timeout(sd_event_source *source, usec_t usec, void *userdata) { _cleanup_free_ char *pretty = NULL; - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); - assert(m); assert(m->current_server_name); assert(m->current_server_address); @@ -173,9 +172,7 @@ static int manager_send_request(Manager *m) { } static int manager_timer(sd_event_source *source, usec_t usec, void *userdata) { - Manager *m = userdata; - - assert(m); + Manager *m = ASSERT_PTR(userdata); return manager_send_request(m); } @@ -207,9 +204,7 @@ static int manager_arm_timer(Manager *m, usec_t next) { } static int manager_clock_watch(sd_event_source *source, int fd, uint32_t revents, void *userdata) { - Manager *m = userdata; - - assert(m); + Manager *m = ASSERT_PTR(userdata); /* rearm timer */ manager_clock_watch_setup(m); @@ -395,7 +390,7 @@ static void manager_adjust_poll(Manager *m, double offset, bool spike) { } static int manager_receive_response(sd_event_source *source, int fd, uint32_t revents, void *userdata) { - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); struct ntp_msg ntpmsg; struct iovec iov = { @@ -421,7 +416,6 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re int leap_sec, r; assert(source); - assert(m); if (revents & (EPOLLHUP|EPOLLERR)) { log_warning("Server connection returned error."); @@ -783,9 +777,7 @@ static int manager_resolve_handler(sd_resolve_query *q, int ret, const struct ad } static int manager_retry_connect(sd_event_source *source, usec_t usec, void *userdata) { - Manager *m = userdata; - - assert(m); + Manager *m = ASSERT_PTR(userdata); return manager_connect(m); } @@ -1040,12 +1032,10 @@ bool manager_is_connected(Manager *m) { } static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) { - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); bool changed, connected, online; int r; - assert(m); - sd_network_monitor_flush(m->network_monitor); /* When manager_network_read_link_servers() failed, we assume that the servers are changed. */ @@ -1165,9 +1155,7 @@ int manager_new(Manager **ret) { } static int manager_save_time_handler(sd_event_source *s, uint64_t usec, void *userdata) { - Manager *m = userdata; - - assert(m); + Manager *m = ASSERT_PTR(userdata); (void) manager_save_time_and_rearm(m, USEC_INFINITY); return 0; |