From 99f37ad86e114b2d1c9eaedf2bc1a0004a265d26 Mon Sep 17 00:00:00 2001 From: Shawn Landden Date: Wed, 20 Nov 2013 00:35:04 -0800 Subject: [PATCH] service: remove unneccesary Socket.got_socket_fd --- src/core/service.c | 3 +-- src/core/service.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/core/service.c b/src/core/service.c index fcfeda738..530a305b4 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -2827,7 +2827,7 @@ _pure_ static bool service_check_snapshot(Unit *u) { assert(s); - return !s->got_socket_fd; + return (s->socket_fd < 0); } static int service_retry_pid_file(Service *s) { @@ -3709,7 +3709,6 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock) { return -EAGAIN; s->socket_fd = fd; - s->got_socket_fd = true; unit_ref_set(&s->accept_socket, UNIT(sock)); diff --git a/src/core/service.h b/src/core/service.h index b5750244a..1992926e9 100644 --- a/src/core/service.h +++ b/src/core/service.h @@ -26,7 +26,6 @@ typedef struct Service Service; #include "unit.h" #include "path.h" #include "ratelimit.h" -#include "service.h" #include "kill.h" #include "exit-status.h" @@ -173,7 +172,6 @@ struct Service { bool main_pid_alien:1; bool bus_name_good:1; bool forbid_restart:1; - bool got_socket_fd:1; bool start_timeout_defined:1; #ifdef HAVE_SYSV_COMPAT bool is_sysv:1; -- 2.30.2