libmicrohttpd

commit 696e0401466e3b0b8da467acfa9d0c25faf4527d
parent 068f4b6b8621e9093c6ee9290bf22143de5e8871
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date:   Fri, 10 Nov 2023 09:42:51 +0300

MHD_D_DOES_SCKT_FIT_FDSET_(): simplified macro

Diffstat:
M
src/microhttpd/daemon.c
 | 
13
++++---------
M
src/microhttpd/internal.h
 | 
4
++--
M
src/microhttpd/response.c
 | 
4
+---

3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -3060,7 +3060,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
 #endif
 
   if (MHD_D_IS_USING_SELECT_ (daemon) &&
-      (! MHD_D_DOES_SCKT_FIT_FDSET_ (client_socket, NULL, daemon)) )
+      (! MHD_D_DOES_SCKT_FIT_FDSET_ (client_socket, daemon)) )
   {
 #ifdef HAVE_MESSAGES
     MHD_DLOG (daemon,
@@ -7727,8 +7727,7 @@ MHD_start_daemon_va (unsigned int flags,
       return NULL;
     }
     if (MHD_D_IS_USING_SELECT_ (daemon) &&
-        (! MHD_D_DOES_SCKT_FIT_FDSET_ (MHD_itc_r_fd_ (daemon->itc), \
-                                       NULL, daemon)) )
+        (! MHD_D_DOES_SCKT_FIT_FDSET_ (MHD_itc_r_fd_ (daemon->itc), daemon)) )
     {
 #ifdef HAVE_MESSAGES
       MHD_DLOG (daemon,
@@ -8195,9 +8194,7 @@ MHD_start_daemon_va (unsigned int flags,
     else
       daemon->listen_nonblk = true;
     if (MHD_D_IS_USING_SELECT_ (daemon) &&
-        (! MHD_D_DOES_SCKT_FIT_FDSET_ (listen_fd, \
-                                       NULL, \
-                                       daemon)) )
+        (! MHD_D_DOES_SCKT_FIT_FDSET_ (listen_fd, daemon)) )
     {
 #ifdef HAVE_MESSAGES
       MHD_DLOG (daemon,
@@ -8400,9 +8397,7 @@ MHD_start_daemon_va (unsigned int flags,
             goto thread_failed;
           }
           if (MHD_D_IS_USING_SELECT_ (d) &&
-              (! MHD_D_DOES_SCKT_FIT_FDSET_ (MHD_itc_r_fd_ (d->itc), \
-                                             NULL, \
-                                             daemon)) )
+              (! MHD_D_DOES_SCKT_FIT_FDSET_ (MHD_itc_r_fd_ (d->itc), daemon)) )
           {
 #ifdef HAVE_MESSAGES
             MHD_DLOG (daemon,
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
@@ -2586,8 +2586,8 @@ struct MHD_Daemon
 /**
  * Check whether socket @a sckt fits fd_sets used by the daemon @a d
  */
-#define MHD_D_DOES_SCKT_FIT_FDSET_(sckt,pset,d) \
-  MHD_SCKT_FD_FITS_FDSET_SETSIZE_(sckt,pset,MHD_D_GET_FD_SETSIZE_(d))
+#define MHD_D_DOES_SCKT_FIT_FDSET_(sckt,d) \
+  MHD_SCKT_FD_FITS_FDSET_SETSIZE_(sckt,NULL,MHD_D_GET_FD_SETSIZE_(d))
 
 
 #ifdef DAUTH_SUPPORT
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
@@ -2031,9 +2031,7 @@ MHD_response_execute_upgrade_ (struct MHD_Response *response,
     }
 #endif /* MHD_socket_nosignal_ */
     if (MHD_D_IS_USING_SELECT_ (daemon) &&
-        (! MHD_D_DOES_SCKT_FIT_FDSET_ (sv[1], \
-                                       NULL, \
-                                       daemon)) )
+        (! MHD_D_DOES_SCKT_FIT_FDSET_ (sv[1], daemon)) )
     {
 #ifdef HAVE_MESSAGES
       MHD_DLOG (daemon,