summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorShawn Landden <shawn@churchofgit.com>2013-11-20 00:35:04 -0800
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-12-01 19:53:55 -0500
commit99f37ad86e114b2d1c9eaedf2bc1a0004a265d26 (patch)
tree7641da6b5deb30db93145c35cab3afbe996309db /src/core
parente4afbb3eac5b20cf2fdf240af1caa576600ce152 (diff)
service: remove unneccesary Socket.got_socket_fd
Diffstat (limited to 'src/core')
-rw-r--r--src/core/service.c3
-rw-r--r--src/core/service.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/core/service.c b/src/core/service.c
index fcfeda7382..530a305b4b 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 b5750244a5..1992926e92 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;