[GNUnet-SVN] [libmicrohttpd] 95/154: simplify

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository libmicrohttpd.

commit 497c1d68bee5b9acac92b8d92b12d6a284cc8399
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Jul 25 20:19:11 2019 +0200

    simplify
---
 src/microhttpd/mhd_send.c | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index 49fd1edf..111fdcfe 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -48,11 +48,6 @@ post_cork_setsockopt (struct MHD_Connection *connection,
   const MHD_SCKT_OPT_BOOL_ on_val = 1;
 
 #if TCP_CORK
-  ret = setsockopt (connection->socket_fd,
-                    IPPROTO_TCP,
-                    TCP_CORK,
-                    (const void *) &on_val,
-                    sizeof (on_val));
 #elif TCP_NODELAY
   ret = setsockopt (connection->socket_fd,
                     IPPROTO_TCP,
@@ -92,18 +87,11 @@ pre_cork_setsockopt (struct MHD_Connection *connection,
 
   ret = -1;
 #if TCP_CORK
-  if (want_cork)
-    ret = setsockopt (connection->socket_fd,
-                      IPPROTO_TCP,
-                      TCP_CORK,
-                      (const void *) &on_val,
-                      sizeof (on_val));
-  else
-    ret = setsockopt (connection->socket_fd,
-                      IPPROTO_TCP,
-                      TCP_CORK,
-                      (const void *) &off_val,
-                      sizeof (off_val));
+  ret = setsockopt (connection->socket_fd,
+                    IPPROTO_TCP,
+                    TCP_CORK,
+                    (const void *) want_cork ? &on_val : &off_val,
+                    sizeof (on_val));
 #elif TCP_NODELAY
   ret = setsockopt (connection->socket_fd,
                     IPPROTO_TCP,

-- 
To stop receiving notification emails like this one, please contact
address@hidden.