From: Jelle van der Waa Date: Sat, 17 May 2025 17:53:12 +0000 (+0200) Subject: sd-event: rename 's' -> 'ret' X-Git-Tag: v258-rc1~559^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00299a80f7a3d6cdf324c07e5651f08023949671;p=thirdparty%2Fsystemd.git sd-event: rename 's' -> 'ret' --- diff --git a/src/home/homed-manager.c b/src/home/homed-manager.c index ec3bfdab995..5575662ca62 100644 --- a/src/home/homed-manager.c +++ b/src/home/homed-manager.c @@ -242,16 +242,16 @@ int manager_new(Manager **ret) { if (r < 0) return r; - r = sd_event_add_memory_pressure(m->event, /* ret_event_source= */ NULL, /* callback= */ NULL, /* userdata= */ NULL); + r = sd_event_add_memory_pressure(m->event, /* ret= */ NULL, /* callback= */ NULL, /* userdata= */ NULL); if (r < 0) log_full_errno(ERRNO_IS_NOT_SUPPORTED(r) || ERRNO_IS_PRIVILEGE(r) || (r == -EHOSTDOWN) ? LOG_DEBUG : LOG_WARNING, r, "Failed to allocate memory pressure watch, ignoring: %m"); - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, /* userdata = */ NULL); + r = sd_event_add_signal(m->event, /* ret= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, /* userdata = */ NULL); if (r < 0) return r; - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, SIGUSR1|SD_EVENT_SIGNAL_PROCMASK, sigusr1_handler, m); + r = sd_event_add_signal(m->event, /* ret= */ NULL, SIGUSR1|SD_EVENT_SIGNAL_PROCMASK, sigusr1_handler, m); if (r < 0) return r; diff --git a/src/journal/journalctl-show.c b/src/journal/journalctl-show.c index 1fe39ed1020..4a704314ad9 100644 --- a/src/journal/journalctl-show.c +++ b/src/journal/journalctl-show.c @@ -427,8 +427,8 @@ static int setup_event(Context *c, int fd) { if (r < 0) return log_error_errno(r, "Failed to allocate sd_event object: %m"); - (void) sd_event_add_signal(e, /* ret_event_source= */ NULL, SIGTERM | SD_EVENT_SIGNAL_PROCMASK, on_signal, c); - (void) sd_event_add_signal(e, /* ret_event_source= */ NULL, SIGINT | SD_EVENT_SIGNAL_PROCMASK, on_signal, c); + (void) sd_event_add_signal(e, /* ret= */ NULL, SIGTERM | SD_EVENT_SIGNAL_PROCMASK, on_signal, c); + (void) sd_event_add_signal(e, /* ret= */ NULL, SIGINT | SD_EVENT_SIGNAL_PROCMASK, on_signal, c); r = sd_event_add_io(e, NULL, fd, EPOLLIN, &on_journal_event, c); if (r < 0) diff --git a/src/journal/journald-manager.c b/src/journal/journald-manager.c index 3d81808c946..33a79cefb29 100644 --- a/src/journal/journald-manager.c +++ b/src/journal/journald-manager.c @@ -1834,7 +1834,7 @@ static int manager_setup_signals(Manager *m) { if (r < 0) return r; - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, &m->sigrtmin18_info); + r = sd_event_add_signal(m->event, /* ret= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, &m->sigrtmin18_info); if (r < 0) return r; diff --git a/src/libsystemd/sd-event/event-util.h b/src/libsystemd/sd-event/event-util.h index 3d5ee4d3310..02dc3929ca7 100644 --- a/src/libsystemd/sd-event/event-util.h +++ b/src/libsystemd/sd-event/event-util.h @@ -38,7 +38,7 @@ static inline int event_source_disable(sd_event_source *s) { int event_add_time_change(sd_event *e, sd_event_source **ret, sd_event_io_handler_t callback, void *userdata); -int event_add_child_pidref(sd_event *e, sd_event_source **s, const PidRef *pid, int options, sd_event_child_handler_t callback, void *userdata); +int event_add_child_pidref(sd_event *e, sd_event_source **ret, const PidRef *pid, int options, sd_event_child_handler_t callback, void *userdata); int event_source_get_child_pidref(sd_event_source *s, PidRef *ret); diff --git a/src/login/logind.c b/src/login/logind.c index 2a59c4af523..73f1e628daf 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -96,7 +96,7 @@ static int manager_new(Manager **ret) { if (r < 0) return r; - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, /* userdata= */ NULL); + r = sd_event_add_signal(m->event, /* ret= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, /* userdata= */ NULL); if (r < 0) return r; @@ -883,7 +883,7 @@ static int manager_connect_console(Manager *m) { assert_se(ignore_signals(SIGRTMIN + 1) >= 0); - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, (SIGRTMIN + 0) | SD_EVENT_SIGNAL_PROCMASK, manager_vt_switch, m); + r = sd_event_add_signal(m->event, /* ret= */ NULL, (SIGRTMIN + 0) | SD_EVENT_SIGNAL_PROCMASK, manager_vt_switch, m); if (r < 0) return log_error_errno(r, "Failed to subscribe to SIGRTMIN+0 signal: %m"); @@ -1134,7 +1134,7 @@ static int manager_startup(Manager *m) { assert(m); - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, SIGHUP|SD_EVENT_SIGNAL_PROCMASK, manager_dispatch_reload_signal, m); + r = sd_event_add_signal(m->event, /* ret= */ NULL, SIGHUP|SD_EVENT_SIGNAL_PROCMASK, manager_dispatch_reload_signal, m); if (r < 0) return log_error_errno(r, "Failed to register SIGHUP handler: %m"); diff --git a/src/machine/machined.c b/src/machine/machined.c index 658a7e4f207..722b2363dcc 100644 --- a/src/machine/machined.c +++ b/src/machine/machined.c @@ -63,7 +63,7 @@ static int manager_new(Manager **ret) { if (r < 0) return r; - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, /* userdata= */ NULL); + r = sd_event_add_signal(m->event, /* ret= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, /* userdata= */ NULL); if (r < 0) return r; diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c index b494ea0c284..f5389accd93 100644 --- a/src/oom/oomd-manager.c +++ b/src/oom/oomd-manager.c @@ -684,7 +684,7 @@ int manager_new(Manager **ret) { (void) sd_event_set_watchdog(m->event, true); - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, SIGHUP | SD_EVENT_SIGNAL_PROCMASK, manager_dispatch_reload_signal, m); + r = sd_event_add_signal(m->event, /* ret= */ NULL, SIGHUP | SD_EVENT_SIGNAL_PROCMASK, manager_dispatch_reload_signal, m); if (r < 0) return r; diff --git a/src/portable/portabled.c b/src/portable/portabled.c index b9c880992d5..d192c243268 100644 --- a/src/portable/portabled.c +++ b/src/portable/portabled.c @@ -45,7 +45,7 @@ static int manager_new(Manager **ret) { if (r < 0) return r; - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, /* userdata= */ NULL); + r = sd_event_add_signal(m->event, /* ret= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, /* userdata= */ NULL); if (r < 0) return r; diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index f44fde2882a..f5c2fafd901 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -789,23 +789,23 @@ int manager_new(Manager **ret) { if (r < 0) return r; - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, SIGHUP | SD_EVENT_SIGNAL_PROCMASK, manager_dispatch_reload_signal, m); + r = sd_event_add_signal(m->event, /* ret= */ NULL, SIGHUP | SD_EVENT_SIGNAL_PROCMASK, manager_dispatch_reload_signal, m); if (r < 0) return log_debug_errno(r, "Failed install SIGHUP handler: %m"); - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, SIGUSR1 | SD_EVENT_SIGNAL_PROCMASK, manager_sigusr1, m); + r = sd_event_add_signal(m->event, /* ret= */ NULL, SIGUSR1 | SD_EVENT_SIGNAL_PROCMASK, manager_sigusr1, m); if (r < 0) return log_debug_errno(r, "Failed install SIGUSR1 handler: %m"); - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, SIGUSR2 | SD_EVENT_SIGNAL_PROCMASK, manager_sigusr2, m); + r = sd_event_add_signal(m->event, /* ret= */ NULL, SIGUSR2 | SD_EVENT_SIGNAL_PROCMASK, manager_sigusr2, m); if (r < 0) return log_debug_errno(r, "Failed install SIGUSR2 handler: %m"); - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, (SIGRTMIN+1) | SD_EVENT_SIGNAL_PROCMASK, manager_sigrtmin1, m); + r = sd_event_add_signal(m->event, /* ret= */ NULL, (SIGRTMIN+1) | SD_EVENT_SIGNAL_PROCMASK, manager_sigrtmin1, m); if (r < 0) return log_debug_errno(r, "Failed install SIGRTMIN+1 handler: %m"); - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, (SIGRTMIN+18) | SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, &m->sigrtmin18_info); + r = sd_event_add_signal(m->event, /* ret= */ NULL, (SIGRTMIN+18) | SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, &m->sigrtmin18_info); if (r < 0) return log_debug_errno(r, "Failed install SIGRTMIN+18 handler: %m"); diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c index 008f3c4e09e..71c87a46066 100644 --- a/src/storagetm/storagetm.c +++ b/src/storagetm/storagetm.c @@ -1087,7 +1087,7 @@ static int on_address_change(sd_netlink *rtnl, sd_netlink_message *mm, void *use if (!c->display_refresh_scheduled) { r = sd_event_add_time_relative( sd_netlink_get_event(rtnl), - /* ret_slot= */ NULL, + /* ret= */ NULL, CLOCK_MONOTONIC, 750 * USEC_PER_MSEC, 0, diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h index 1e19dd4eac8..4d89b3472c0 100644 --- a/src/systemd/sd-event.h +++ b/src/systemd/sd-event.h @@ -88,18 +88,18 @@ int sd_event_new(sd_event **e); sd_event* sd_event_ref(sd_event *e); sd_event* sd_event_unref(sd_event *e); -int sd_event_add_io(sd_event *e, sd_event_source **s, int fd, uint32_t events, sd_event_io_handler_t callback, void *userdata); -int sd_event_add_time(sd_event *e, sd_event_source **s, clockid_t clock, uint64_t usec, uint64_t accuracy, sd_event_time_handler_t callback, void *userdata); -int sd_event_add_time_relative(sd_event *e, sd_event_source **s, clockid_t clock, uint64_t usec, uint64_t accuracy, sd_event_time_handler_t callback, void *userdata); -int sd_event_add_signal(sd_event *e, sd_event_source **s, int sig, sd_event_signal_handler_t callback, void *userdata); -int sd_event_add_child(sd_event *e, sd_event_source **s, pid_t pid, int options, sd_event_child_handler_t callback, void *userdata); -int sd_event_add_child_pidfd(sd_event *e, sd_event_source **s, int pidfd, int options, sd_event_child_handler_t callback, void *userdata); -int sd_event_add_inotify(sd_event *e, sd_event_source **s, const char *path, uint32_t mask, sd_event_inotify_handler_t callback, void *userdata); -int sd_event_add_inotify_fd(sd_event *e, sd_event_source **s, int fd, uint32_t mask, sd_event_inotify_handler_t callback, void *userdata); -int sd_event_add_defer(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata); -int sd_event_add_post(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata); -int sd_event_add_exit(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata); -int sd_event_add_memory_pressure(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata); +int sd_event_add_io(sd_event *e, sd_event_source **ret, int fd, uint32_t events, sd_event_io_handler_t callback, void *userdata); +int sd_event_add_time(sd_event *e, sd_event_source **ret, clockid_t clock, uint64_t usec, uint64_t accuracy, sd_event_time_handler_t callback, void *userdata); +int sd_event_add_time_relative(sd_event *e, sd_event_source **ret, clockid_t clock, uint64_t usec, uint64_t accuracy, sd_event_time_handler_t callback, void *userdata); +int sd_event_add_signal(sd_event *e, sd_event_source **ret, int sig, sd_event_signal_handler_t callback, void *userdata); +int sd_event_add_child(sd_event *e, sd_event_source **ret, pid_t pid, int options, sd_event_child_handler_t callback, void *userdata); +int sd_event_add_child_pidfd(sd_event *e, sd_event_source **ret, int pidfd, int options, sd_event_child_handler_t callback, void *userdata); +int sd_event_add_inotify(sd_event *e, sd_event_source **ret, const char *path, uint32_t mask, sd_event_inotify_handler_t callback, void *userdata); +int sd_event_add_inotify_fd(sd_event *e, sd_event_source **ret, int fd, uint32_t mask, sd_event_inotify_handler_t callback, void *userdata); +int sd_event_add_defer(sd_event *e, sd_event_source **ret, sd_event_handler_t callback, void *userdata); +int sd_event_add_post(sd_event *e, sd_event_source **ret, sd_event_handler_t callback, void *userdata); +int sd_event_add_exit(sd_event *e, sd_event_source **ret, sd_event_handler_t callback, void *userdata); +int sd_event_add_memory_pressure(sd_event *e, sd_event_source **ret, sd_event_handler_t callback, void *userdata); int sd_event_prepare(sd_event *e); int sd_event_wait(sd_event *e, uint64_t usec); diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 69d6703949c..de490cc0ba1 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -1138,7 +1138,7 @@ int manager_new(Manager **ret) { if (r < 0) return r; - r = sd_event_add_signal(m->event, /* ret_event_source= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, /* userdata= */ NULL); + r = sd_event_add_signal(m->event, /* ret= */ NULL, (SIGRTMIN+18)|SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, /* userdata= */ NULL); if (r < 0) log_debug_errno(r, "Failed to install SIGRTMIN+18 signal handler, ignoring: %m"); diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c index 2cd40f1d1d1..8d0d6d58586 100644 --- a/src/udev/udev-manager.c +++ b/src/udev/udev-manager.c @@ -1377,17 +1377,17 @@ static int manager_setup_event(Manager *manager) { if (r < 0) return log_error_errno(r, "Failed to create SIGHUP event source: %m"); - r = sd_event_add_post(e, /* ret_event_source = */ NULL, on_post, manager); + r = sd_event_add_post(e, /* ret = */ NULL, on_post, manager); if (r < 0) return log_error_errno(r, "Failed to create post event source: %m"); /* Eventually, we probably want to do more here on memory pressure, for example, kill idle workers immediately */ - r = sd_event_add_memory_pressure(e, /* ret_event_source= */ NULL, /* callback= */ NULL, /* userdata= */ NULL); + r = sd_event_add_memory_pressure(e, /* ret= */ NULL, /* callback= */ NULL, /* userdata= */ NULL); if (r < 0) log_full_errno(ERRNO_IS_NOT_SUPPORTED(r) || ERRNO_IS_PRIVILEGE(r) || (r == -EHOSTDOWN) ? LOG_DEBUG : LOG_WARNING, r, "Failed to allocate memory pressure watch, ignoring: %m"); - r = sd_event_add_signal(e, /* ret_event_source= */ NULL, + r = sd_event_add_signal(e, /* ret= */ NULL, (SIGRTMIN+18) | SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, /* userdata= */ NULL); if (r < 0) return log_error_errno(r, "Failed to allocate SIGRTMIN+18 event source, ignoring: %m"); diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c index 945bf0b8ca0..01f16db63c0 100644 --- a/src/udev/udev-watch.c +++ b/src/udev/udev-watch.c @@ -630,7 +630,7 @@ static int notify_and_wait_signal(UdevWorker *worker, sd_device *dev, const char if (r < 0) return r; - r = sd_event_add_signal(e, /* ret_event_source = */ NULL, SIGUSR1 | SD_EVENT_SIGNAL_PROCMASK, on_sigusr1, worker); + r = sd_event_add_signal(e, /* ret = */ NULL, SIGUSR1 | SD_EVENT_SIGNAL_PROCMASK, on_sigusr1, worker); if (r < 0) return r; diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c index 8a3b2f1b086..54d6ce770a3 100644 --- a/src/vmspawn/vmspawn.c +++ b/src/vmspawn/vmspawn.c @@ -2434,7 +2434,7 @@ static int run_virtual_machine(int kvm_device_fd, int vhost_device_fd) { log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); /* Exit when the child exits */ - r = event_add_child_pidref(event, /* ret_event_source= */ NULL, &child_pidref, WEXITED, on_child_exit, /* userdata= */ NULL); + r = event_add_child_pidref(event, /* ret= */ NULL, &child_pidref, WEXITED, on_child_exit, /* userdata= */ NULL); if (r < 0) return log_error_errno(r, "Failed to watch qemu process: &m");