[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 13/31: MHD_start_daemon(): minor readability improvement
From: |
gnunet |
Subject: |
[libmicrohttpd] 13/31: MHD_start_daemon(): minor readability improvement |
Date: |
Mon, 10 Oct 2022 13:00:58 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 759eb24fbdc88d070cf4bfcefe53de4edbc07a41
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Thu Oct 6 11:46:23 2022 +0300
MHD_start_daemon(): minor readability improvement
---
src/microhttpd/daemon.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index a9164341..b02978b9 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -6737,16 +6737,17 @@ MHD_start_daemon_va (unsigned int flags,
return NULL;
/* Check for invalid combinations of flags. */
- if ( ((0 != (*pflags & MHD_USE_POLL)) && (0 != (*pflags & MHD_USE_EPOLL))) ||
- ((0 != (*pflags & MHD_USE_EPOLL)) && (0 != (*pflags
- &
-
MHD_USE_THREAD_PER_CONNECTION)))
- ||
- ((0 != (*pflags & MHD_USE_POLL)) &&
- (0 == (*pflags & (MHD_USE_INTERNAL_POLLING_THREAD
- | MHD_USE_THREAD_PER_CONNECTION)))) ||
- ((0 != (*pflags & MHD_USE_AUTO)) && (0 != (*pflags & (MHD_USE_POLL
- |
MHD_USE_EPOLL)))) )
+ if ((0 != (*pflags & MHD_USE_POLL)) && (0 != (*pflags & MHD_USE_EPOLL)))
+ return NULL;
+ if ((0 != (*pflags & MHD_USE_EPOLL)) &&
+ (0 != (*pflags & MHD_USE_THREAD_PER_CONNECTION)))
+ return NULL;
+ if ((0 != (*pflags & MHD_USE_POLL)) &&
+ (0 == (*pflags & (MHD_USE_INTERNAL_POLLING_THREAD
+ | MHD_USE_THREAD_PER_CONNECTION))))
+ return NULL;
+ if ((0 != (*pflags & MHD_USE_AUTO)) &&
+ (0 != (*pflags & (MHD_USE_POLL | MHD_USE_EPOLL))))
return NULL;
if (0 != (*pflags & MHD_USE_AUTO))
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [libmicrohttpd] 04/31: testcurl/https: stopped CA file creation/removal, (continued)
- [libmicrohttpd] 04/31: testcurl/https: stopped CA file creation/removal, gnunet, 2022/10/10
- [libmicrohttpd] 05/31: testcurl/https: removed explicit cipher setting, gnunet, 2022/10/10
- [libmicrohttpd] 01/31: Removed curl_version_check, gnunet, 2022/10/10
- [libmicrohttpd] 07/31: test_https_session_info: fixed compiler warning with old libcurl, gnunet, 2022/10/10
- [libmicrohttpd] 12/31: test_https_time_out: second attempt to really check something with this test, gnunet, 2022/10/10
- [libmicrohttpd] 02/31: testcurl/https: fixed functions declarations, gnunet, 2022/10/10
- [libmicrohttpd] 03/31: testcurl/https: fixed compiler warnings, wrong types, gnunet, 2022/10/10
- [libmicrohttpd] 06/31: testcurl/https: do not enforce TLSv1, gnunet, 2022/10/10
- [libmicrohttpd] 08/31: testcurl/https: removed usage of deprecated libcurl parameter, gnunet, 2022/10/10
- [libmicrohttpd] 10/31: test_https_get_parallel{,_threads}: removed artificial delay, gnunet, 2022/10/10
- [libmicrohttpd] 13/31: MHD_start_daemon(): minor readability improvement,
gnunet <=
- [libmicrohttpd] 14/31: microhttpd.h: improved doxy for MHD_USE_THREAD_PER_CONNECTION, gnunet, 2022/10/10
- [libmicrohttpd] 15/31: MHD_run_wait(): improved readability, gnunet, 2022/10/10
- [libmicrohttpd] 11/31: daemon: fixed delayed notification callback in thread-per-connection mode, gnunet, 2022/10/10
- [libmicrohttpd] 16/31: daemon: small refactoring for more compact code when poll() is not supported, gnunet, 2022/10/10
- [libmicrohttpd] 17/31: MHD_poll(): removed unneeded check, gnunet, 2022/10/10
- [libmicrohttpd] 18/31: testcurl/https: significantly simplified test URI, gnunet, 2022/10/10
- [libmicrohttpd] 25/31: test_https_get_parallel_threads: removed libcurl-GnuTLS requirement, gnunet, 2022/10/10
- [libmicrohttpd] 09/31: testcurl/https: enable verbose libcurl on debug builds, gnunet, 2022/10/10
- [libmicrohttpd] 21/31: test_tls_extensions: removed unused test, gnunet, 2022/10/10
- [libmicrohttpd] 29/31: https tests: updated self-signed certificate, gnunet, 2022/10/10