diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2023-11-10 09:42:51 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2023-11-10 17:38:25 +0300 |
commit | 696e0401466e3b0b8da467acfa9d0c25faf4527d (patch) | |
tree | bc9e8312d446fca3b0d0b407ab4d7ef6b6e58fe3 | |
parent | 068f4b6b8621e9093c6ee9290bf22143de5e8871 (diff) | |
download | libmicrohttpd-696e0401466e3b0b8da467acfa9d0c25faf4527d.tar.gz libmicrohttpd-696e0401466e3b0b8da467acfa9d0c25faf4527d.zip |
MHD_D_DOES_SCKT_FIT_FDSET_(): simplified macro
-rw-r--r-- | src/microhttpd/daemon.c | 13 | ||||
-rw-r--r-- | src/microhttpd/internal.h | 4 | ||||
-rw-r--r-- | 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, | |||
3060 | #endif | 3060 | #endif |
3061 | 3061 | ||
3062 | if (MHD_D_IS_USING_SELECT_ (daemon) && | 3062 | if (MHD_D_IS_USING_SELECT_ (daemon) && |
3063 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (client_socket, NULL, daemon)) ) | 3063 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (client_socket, daemon)) ) |
3064 | { | 3064 | { |
3065 | #ifdef HAVE_MESSAGES | 3065 | #ifdef HAVE_MESSAGES |
3066 | MHD_DLOG (daemon, | 3066 | MHD_DLOG (daemon, |
@@ -7727,8 +7727,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
7727 | return NULL; | 7727 | return NULL; |
7728 | } | 7728 | } |
7729 | if (MHD_D_IS_USING_SELECT_ (daemon) && | 7729 | if (MHD_D_IS_USING_SELECT_ (daemon) && |
7730 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (MHD_itc_r_fd_ (daemon->itc), \ | 7730 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (MHD_itc_r_fd_ (daemon->itc), daemon)) ) |
7731 | NULL, daemon)) ) | ||
7732 | { | 7731 | { |
7733 | #ifdef HAVE_MESSAGES | 7732 | #ifdef HAVE_MESSAGES |
7734 | MHD_DLOG (daemon, | 7733 | MHD_DLOG (daemon, |
@@ -8195,9 +8194,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
8195 | else | 8194 | else |
8196 | daemon->listen_nonblk = true; | 8195 | daemon->listen_nonblk = true; |
8197 | if (MHD_D_IS_USING_SELECT_ (daemon) && | 8196 | if (MHD_D_IS_USING_SELECT_ (daemon) && |
8198 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (listen_fd, \ | 8197 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (listen_fd, daemon)) ) |
8199 | NULL, \ | ||
8200 | daemon)) ) | ||
8201 | { | 8198 | { |
8202 | #ifdef HAVE_MESSAGES | 8199 | #ifdef HAVE_MESSAGES |
8203 | MHD_DLOG (daemon, | 8200 | MHD_DLOG (daemon, |
@@ -8400,9 +8397,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
8400 | goto thread_failed; | 8397 | goto thread_failed; |
8401 | } | 8398 | } |
8402 | if (MHD_D_IS_USING_SELECT_ (d) && | 8399 | if (MHD_D_IS_USING_SELECT_ (d) && |
8403 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (MHD_itc_r_fd_ (d->itc), \ | 8400 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (MHD_itc_r_fd_ (d->itc), daemon)) ) |
8404 | NULL, \ | ||
8405 | daemon)) ) | ||
8406 | { | 8401 | { |
8407 | #ifdef HAVE_MESSAGES | 8402 | #ifdef HAVE_MESSAGES |
8408 | MHD_DLOG (daemon, | 8403 | 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 | |||
2586 | /** | 2586 | /** |
2587 | * Check whether socket @a sckt fits fd_sets used by the daemon @a d | 2587 | * Check whether socket @a sckt fits fd_sets used by the daemon @a d |
2588 | */ | 2588 | */ |
2589 | #define MHD_D_DOES_SCKT_FIT_FDSET_(sckt,pset,d) \ | 2589 | #define MHD_D_DOES_SCKT_FIT_FDSET_(sckt,d) \ |
2590 | MHD_SCKT_FD_FITS_FDSET_SETSIZE_(sckt,pset,MHD_D_GET_FD_SETSIZE_(d)) | 2590 | MHD_SCKT_FD_FITS_FDSET_SETSIZE_(sckt,NULL,MHD_D_GET_FD_SETSIZE_(d)) |
2591 | 2591 | ||
2592 | 2592 | ||
2593 | #ifdef DAUTH_SUPPORT | 2593 | #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, | |||
2031 | } | 2031 | } |
2032 | #endif /* MHD_socket_nosignal_ */ | 2032 | #endif /* MHD_socket_nosignal_ */ |
2033 | if (MHD_D_IS_USING_SELECT_ (daemon) && | 2033 | if (MHD_D_IS_USING_SELECT_ (daemon) && |
2034 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (sv[1], \ | 2034 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (sv[1], daemon)) ) |
2035 | NULL, \ | ||
2036 | daemon)) ) | ||
2037 | { | 2035 | { |
2038 | #ifdef HAVE_MESSAGES | 2036 | #ifdef HAVE_MESSAGES |
2039 | MHD_DLOG (daemon, | 2037 | MHD_DLOG (daemon, |