[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 01/05: connection.c: muted compiler warning
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 01/05: connection.c: muted compiler warnings, replaced some unused checks with asserts. |
Date: |
Thu, 28 Sep 2017 20:00:16 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 5fb65271fd0f6f22fe186c19120323422cc9eeac
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Thu Sep 28 20:43:25 2017 +0300
connection.c: muted compiler warnings, replaced some unused checks with
asserts.
---
src/microhttpd/connection.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 8fadc8d8..b30c6d1b 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -322,6 +322,7 @@ sendfile_adapter (struct MHD_Connection *connection)
static int
socket_flush_possible(struct MHD_Connection *connection)
{
+ (void)connection; /* Mute compiler warning. */
#if defined(TCP_CORK) || defined(TCP_PUSH)
return MHD_YES;
#else /* !TCP_CORK && !TCP_PUSH */
@@ -341,13 +342,13 @@ static int
socket_start_extra_buffering (struct MHD_Connection *connection)
{
int res = MHD_NO;
+ (void)connection; /* Mute compiler warning. */
#if defined(TCP_CORK) || defined(TCP_NOPUSH)
const MHD_SCKT_OPT_BOOL_ on_val = 1;
#if defined(TCP_NODELAY)
const MHD_SCKT_OPT_BOOL_ off_val = 0;
#endif /* TCP_NODELAY */
- if (!connection)
- return MHD_NO;
+ mhd_assert(NULL != connection);
#if defined(TCP_NOPUSH) && !defined(TCP_CORK)
/* Buffer data before sending */
res = (0 == setsockopt (connection->socket_fd,
@@ -406,8 +407,8 @@ socket_start_no_buffering (struct MHD_Connection
*connection)
const MHD_SCKT_OPT_BOOL_ off_val = 0;
#endif /* TCP_CORK || TCP_NOPUSH */
- if (NULL == connection)
- return MHD_NO;
+ (void)connection; /* Mute compiler warning. */
+ mhd_assert(NULL != connection);
#if defined(TCP_CORK)
/* Allow partial packets */
res &= (0 == setsockopt (connection->socket_fd,
@@ -489,8 +490,7 @@ socket_start_normal_buffering (struct MHD_Connection
*connection)
MHD_SCKT_OPT_BOOL_ cork_val = 0;
socklen_t param_size = sizeof (cork_val);
#endif /* TCP_CORK */
- if (!connection)
- return MHD_NO;
+ mhd_assert(NULL != connection);
#if defined(TCP_CORK)
/* Allow partial packets */
/* Disabling TCP_CORK will flush partial packet even if TCP_CORK wasn't
enabled before
@@ -1070,7 +1070,7 @@ try_ready_chunked_body (struct MHD_Connection *connection)
"%X\r\n",
(unsigned int) ret);
mhd_assert(cblen > 0);
- mhd_assert(cblen < sizeof(cbuf));
+ mhd_assert((size_t)cblen < sizeof(cbuf));
memcpy (&connection->write_buffer[sizeof (cbuf) - cblen],
cbuf,
cblen);
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [libmicrohttpd] branch master updated (42e4a4b6 -> 27c939ad), gnunet, 2017/09/28
- [GNUnet-SVN] [libmicrohttpd] 05/05: mhd_str.c: muted compiler warning, gnunet, 2017/09/28
- [GNUnet-SVN] [libmicrohttpd] 01/05: connection.c: muted compiler warnings, replaced some unused checks with asserts.,
gnunet <=
- [GNUnet-SVN] [libmicrohttpd] 02/05: daemon.c: muted some compiler warnings, added comments., gnunet, 2017/09/28
- [GNUnet-SVN] [libmicrohttpd] 03/05: digestauth.c: muted compiler warning, gnunet, 2017/09/28
- [GNUnet-SVN] [libmicrohttpd] 04/05: postprocessor.c: fixed compiler warnings, gnunet, 2017/09/28