From c3d62b87996337130f7cdfe6787c92d882196be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Janouch?=
Date: Sat, 6 May 2017 21:35:44 +0200
Subject: Avoid the "poller_fd::closed" feature
Reliability enhancement for Linux.
This feature was created for ponymap, however we don't care about an
extra syscall in most places. Doing it right even saves lines.
---
degesch.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
(limited to 'degesch.c')
diff --git a/degesch.c b/degesch.c
index 4a57248..81e893c 100644
--- a/degesch.c
+++ b/degesch.c
@@ -1862,9 +1862,8 @@ server_destroy (struct server *self)
if (self->socket != -1)
{
- xclose (self->socket);
- self->socket_event.closed = true;
poller_fd_reset (&self->socket_event);
+ xclose (self->socket);
}
str_free (&self->read_buffer);
str_free (&self->write_buffer);
@@ -4844,13 +4843,11 @@ irc_destroy_transport (struct server *s)
s->transport->cleanup (s);
s->transport = NULL;
+ poller_fd_reset (&s->socket_event);
xclose (s->socket);
s->socket = -1;
s->state = IRC_DISCONNECTED;
- s->socket_event.closed = true;
- poller_fd_reset (&s->socket_event);
-
str_reset (&s->read_buffer);
str_reset (&s->write_buffer);
}
--
cgit v1.2.3