diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-04-04 15:51:07 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-04-13 06:44:27 +0200 |
| commit | 81a1d6d6790ad6ae8ff63147dfab68e6835178c3 (patch) | |
| tree | 2311c631807bf0b6fe14056fd772a137dd6b59d2 /src/core/service.c | |
| parent | 1ba84fef3c1e505cb1413ef446a85c0c7ec439c6 (diff) | |
| download | systemd-81a1d6d6790ad6ae8ff63147dfab68e6835178c3.tar.gz | |
service: rename service_close_socket_fd() → service_release_socket_fd()
Just to match service_release_stdio_fd() and service_release_fd_store()
in the name, since they do similar things.
This follows the concept that we "release" resources, and this is all
generically wrapped in "service_release_resources()".
Diffstat (limited to 'src/core/service.c')
| -rw-r--r-- | src/core/service.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/service.c b/src/core/service.c index c1669da3a2..e59c579627 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -200,7 +200,7 @@ static int service_set_main_pid(Service *s, pid_t pid) { return 0; } -void service_close_socket_fd(Service *s) { +void service_release_socket_fd(Service *s) { assert(s); if (s->socket_fd < 0 && !UNIT_ISSET(s->accept_socket) && !s->socket_peer) @@ -454,8 +454,6 @@ static void service_done(Unit *u) { s->usb_function_descriptors = mfree(s->usb_function_descriptors); s->usb_function_strings = mfree(s->usb_function_strings); - service_close_socket_fd(s); - service_stop_watchdog(s); s->timer_event_source = sd_event_source_disable_unref(s->timer_event_source); @@ -463,8 +461,9 @@ static void service_done(Unit *u) { s->bus_name_pid_lookup_slot = sd_bus_slot_unref(s->bus_name_pid_lookup_slot); - service_release_fd_store(s); + service_release_socket_fd(s); service_release_stdio_fd(s); + service_release_fd_store(s); } static int on_fd_store_io(sd_event_source *e, int fd, uint32_t revents, void *userdata) { @@ -4974,7 +4973,7 @@ static void service_release_resources(Unit *u) { log_unit_debug(u, "Releasing resources..."); - service_close_socket_fd(s); + service_release_socket_fd(s); service_release_stdio_fd(s); if (s->fd_store_preserve_mode != EXEC_PRESERVE_YES) |