aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-02-28 19:27:48 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-02-28 19:30:43 +0300
commita5b2b99e4bbbcdc226fd9992382f4ccae44dfa50 (patch)
tree97b8a60e3c2392f203c7e6a6a8329a88213c1e34
parentabc6bac2fbc1bd5927e1d2827eca2c15365c16b8 (diff)
downloadlibmicrohttpd-a5b2b99e4bbbcdc226fd9992382f4ccae44dfa50.tar.gz
libmicrohttpd-a5b2b99e4bbbcdc226fd9992382f4ccae44dfa50.zip
MHD_get_timeout(): one more 'int' -> 'bool' replacement.
-rw-r--r--src/microhttpd/daemon.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 9a345621..dafc75ef 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2955,7 +2955,7 @@ MHD_get_timeout (struct MHD_Daemon *daemon,
2955 time_t earliest_deadline; 2955 time_t earliest_deadline;
2956 time_t now; 2956 time_t now;
2957 struct MHD_Connection *pos; 2957 struct MHD_Connection *pos;
2958 int have_timeout; 2958 bool have_timeout;
2959 2959
2960 if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) 2960 if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
2961 { 2961 {
@@ -2983,7 +2983,7 @@ MHD_get_timeout (struct MHD_Daemon *daemon,
2983 } 2983 }
2984#endif /* EPOLL_SUPPORT */ 2984#endif /* EPOLL_SUPPORT */
2985 2985
2986 have_timeout = MHD_NO; 2986 have_timeout = false;;
2987 earliest_deadline = 0; /* avoid compiler warnings */ 2987 earliest_deadline = 0; /* avoid compiler warnings */
2988 for (pos = daemon->manual_timeout_head; NULL != pos; pos = pos->nextX) 2988 for (pos = daemon->manual_timeout_head; NULL != pos; pos = pos->nextX)
2989 { 2989 {
@@ -2992,7 +2992,7 @@ MHD_get_timeout (struct MHD_Daemon *daemon,
2992 if ( (! have_timeout) || 2992 if ( (! have_timeout) ||
2993 (earliest_deadline > pos->last_activity + pos->connection_timeout) ) 2993 (earliest_deadline > pos->last_activity + pos->connection_timeout) )
2994 earliest_deadline = pos->last_activity + pos->connection_timeout; 2994 earliest_deadline = pos->last_activity + pos->connection_timeout;
2995 have_timeout = MHD_YES; 2995 have_timeout = true;
2996 } 2996 }
2997 } 2997 }
2998 /* normal timeouts are sorted, so we only need to look at the 'tail' (oldest) */ 2998 /* normal timeouts are sorted, so we only need to look at the 'tail' (oldest) */
@@ -3003,10 +3003,10 @@ MHD_get_timeout (struct MHD_Daemon *daemon,
3003 if ( (! have_timeout) || 3003 if ( (! have_timeout) ||
3004 (earliest_deadline > pos->last_activity + pos->connection_timeout) ) 3004 (earliest_deadline > pos->last_activity + pos->connection_timeout) )
3005 earliest_deadline = pos->last_activity + pos->connection_timeout; 3005 earliest_deadline = pos->last_activity + pos->connection_timeout;
3006 have_timeout = MHD_YES; 3006 have_timeout = true;
3007 } 3007 }
3008 3008
3009 if (MHD_NO == have_timeout) 3009 if (have_timeout)
3010 return MHD_NO; 3010 return MHD_NO;
3011 now = MHD_monotonic_sec_counter(); 3011 now = MHD_monotonic_sec_counter();
3012 if (earliest_deadline < now) 3012 if (earliest_deadline < now)