From ba38826510c01fe7328f98161d167331bb55b2b2 Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Thu, 3 Apr 2025 16:35:55 +0300 Subject: [PATCH] mhd_daemon_accept_connection(): improved code readability --- src/mhd2/daemon_add_conn.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/mhd2/daemon_add_conn.c b/src/mhd2/daemon_add_conn.c index 173057da..28958dd5 100644 --- a/src/mhd2/daemon_add_conn.c +++ b/src/mhd2/daemon_add_conn.c @@ -978,20 +978,22 @@ mhd_daemon_accept_connection (struct MHD_Daemon *restrict daemon) #endif /* HAVE_INET6 */ } - if (! sk_nonbl && ! mhd_socket_nonblocking (s)) - { - mhd_LOG_MSG (daemon, MHD_SC_ACCEPT_CONFIGURE_NONBLOCKING_FAILED, \ - "Failed to set nonblocking mode on incoming connection " \ - "socket."); + if (! sk_nonbl) + { /* Was not set automatically */ + sk_nonbl = mhd_socket_nonblocking (s); + if (! sk_nonbl) + mhd_LOG_MSG (daemon, MHD_SC_ACCEPT_CONFIGURE_NONBLOCKING_FAILED, \ + "Failed to set nonblocking mode on " + "new connection socket."); } - else - sk_nonbl = true; - if (! sk_cloexec && ! mhd_socket_noninheritable (s)) - { - mhd_LOG_MSG (daemon, MHD_SC_ACCEPT_CONFIGURE_NOINHERIT_FAILED, \ - "Failed to set non-inheritable mode on incoming connection " \ - "socket."); + if (! sk_cloexec) + { /* Was not set automatically */ + sk_cloexec = mhd_socket_noninheritable (s); + if (! sk_cloexec) + mhd_LOG_MSG (daemon, MHD_SC_ACCEPT_CONFIGURE_NOINHERIT_FAILED, \ + "Failed to set non-inheritable mode on " + "new connection socket."); } #if defined(mhd_socket_nosignal)