aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/daemon.c
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-06-12 23:40:51 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-06-12 23:40:51 +0300
commitb10f4140c68bd41ed600abf08b4990d79be598b4 (patch)
tree8e5e8e0d05d2957d759623f83dfe27032f332d74 /src/microhttpd/daemon.c
parent279a9ad2ab9f504264f3e1a671fc427a18079205 (diff)
downloadlibmicrohttpd-b10f4140c68bd41ed600abf08b4990d79be598b4.tar.gz
libmicrohttpd-b10f4140c68bd41ed600abf08b4990d79be598b4.zip
Use 'mhd_assert()'
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r--src/microhttpd/daemon.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index cb7064a4..f2d4f73b 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2081,7 +2081,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
2081 int eno = 0; 2081 int eno = 0;
2082 2082
2083 /* Direct add to master daemon could happen only with "external" add mode. */ 2083 /* Direct add to master daemon could happen only with "external" add mode. */
2084 EXTRA_CHECK ((NULL == daemon->worker_pool) || (external_add)); 2084 mhd_assert ((NULL == daemon->worker_pool) || (external_add));
2085 if ((external_add) && (NULL != daemon->worker_pool)) 2085 if ((external_add) && (NULL != daemon->worker_pool))
2086 { 2086 {
2087 /* have a pool, try to find a pool with capacity; we use the 2087 /* have a pool, try to find a pool with capacity; we use the
@@ -2475,7 +2475,7 @@ internal_suspend_connection_ (struct MHD_Connection *connection)
2475 DLL_remove (daemon->connections_head, 2475 DLL_remove (daemon->connections_head,
2476 daemon->connections_tail, 2476 daemon->connections_tail,
2477 connection); 2477 connection);
2478 EXTRA_CHECK (! connection->suspended); 2478 mhd_assert (! connection->suspended);
2479 DLL_insert (daemon->suspended_connections_head, 2479 DLL_insert (daemon->suspended_connections_head,
2480 daemon->suspended_connections_tail, 2480 daemon->suspended_connections_tail,
2481 connection); 2481 connection);
@@ -2612,7 +2612,7 @@ resume_suspended_connections (struct MHD_Daemon *daemon)
2612 if (daemon->resuming) 2612 if (daemon->resuming)
2613 prev = daemon->suspended_connections_tail; 2613 prev = daemon->suspended_connections_tail;
2614 2614
2615 EXTRA_CHECK(NULL != next); 2615 mhd_assert(NULL != prev);
2616 daemon->resuming = false; 2616 daemon->resuming = false;
2617 2617
2618 while (NULL != (pos = prev)) 2618 while (NULL != (pos = prev))
@@ -2632,7 +2632,7 @@ resume_suspended_connections (struct MHD_Daemon *daemon)
2632 ) 2632 )
2633 continue; 2633 continue;
2634 ret = MHD_YES; 2634 ret = MHD_YES;
2635 EXTRA_CHECK (pos->suspended); 2635 mhd_assert (pos->suspended);
2636 DLL_remove (daemon->suspended_connections_head, 2636 DLL_remove (daemon->suspended_connections_head,
2637 daemon->suspended_connections_tail, 2637 daemon->suspended_connections_tail,
2638 pos); 2638 pos);
@@ -4266,8 +4266,8 @@ close_connection (struct MHD_Connection *pos)
4266 4266
4267 MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex); 4267 MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
4268 4268
4269 EXTRA_CHECK (! pos->suspended); 4269 mhd_assert (! pos->suspended);
4270 EXTRA_CHECK (! pos->resuming); 4270 mhd_assert (! pos->resuming);
4271 if (pos->connection_timeout == pos->daemon->connection_timeout) 4271 if (pos->connection_timeout == pos->daemon->connection_timeout)
4272 XDLL_remove (daemon->normal_timeout_head, 4272 XDLL_remove (daemon->normal_timeout_head,
4273 daemon->normal_timeout_tail, 4273 daemon->normal_timeout_tail,