[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 05/07: MHD_D_DOES_SCKT_FIT_FDSET_(): simplified macro
From: |
gnunet |
Subject: |
[libmicrohttpd] 05/07: MHD_D_DOES_SCKT_FIT_FDSET_(): simplified macro |
Date: |
Fri, 10 Nov 2023 15:40:14 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 696e0401466e3b0b8da467acfa9d0c25faf4527d
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Fri Nov 10 09:42:51 2023 +0300
MHD_D_DOES_SCKT_FIT_FDSET_(): simplified macro
---
src/microhttpd/daemon.c | 13 ++++---------
src/microhttpd/internal.h | 4 ++--
src/microhttpd/response.c | 4 +---
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 2aa68d40..12d687e2 100644
--- 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
index eb87c8e6..3d7d774a 100644
--- 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
index 9e9c0d73..ab5e3750 100644
--- 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,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [libmicrohttpd] branch master updated (e62cd69d -> a5649931), gnunet, 2023/11/10
- [libmicrohttpd] 02/07: daemon.c: moved processing and checking of app-provided listen socket, gnunet, 2023/11/10
- [libmicrohttpd] 04/07: MHD_start_daemon(): added some asserts, gnunet, 2023/11/10
- [libmicrohttpd] 03/07: MHD_start_daemon(): mark listen as UNIX based on available information, gnunet, 2023/11/10
- [libmicrohttpd] 01/07: .gitlab-ci.yml: removed "keep-going" make flag, gnunet, 2023/11/10
- [libmicrohttpd] 06/07: MHD_start_daemon(): added stricter checks for bind() and listen() return values, gnunet, 2023/11/10
- [libmicrohttpd] 05/07: MHD_D_DOES_SCKT_FIT_FDSET_(): simplified macro,
gnunet <=
- [libmicrohttpd] 07/07: MHD_start_daemon(): added check for epoll FD to fit fd_set for external polling mode, gnunet, 2023/11/10