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. --- zyklonb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'zyklonb.c') diff --git a/zyklonb.c b/zyklonb.c index fd0c80a..d3de92d 100644 --- a/zyklonb.c +++ b/zyklonb.c @@ -203,8 +203,8 @@ bot_context_free (struct bot_context *self) if (self->irc_fd != -1) { - xclose (self->irc_fd); poller_fd_reset (&self->irc_event); + xclose (self->irc_fd); } if (self->ssl) SSL_free (self->ssl); @@ -1585,13 +1585,11 @@ on_irc_disconnected (struct bot_context *ctx) ctx->ssl_ctx = NULL; } + poller_fd_reset (&ctx->irc_event); xclose (ctx->irc_fd); ctx->irc_fd = -1; ctx->irc_registered = false; - ctx->irc_event.closed = true; - poller_fd_reset (&ctx->irc_event); - // TODO: inform plugins about the disconnect event // All of our timers have lost their meaning now -- cgit v1.2.3