From 0d395639781ff7adbcbc65daeafdc7db23ce1410 Mon Sep 17 00:00:00 2001 From: Neil Cook Date: Wed, 14 Dec 2016 17:50:39 +0000 Subject: [PATCH] Consisten use of TIMEOUT_FOREVER --- src/extension/default_eventloop.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/extension/default_eventloop.c b/src/extension/default_eventloop.c index 9b81f15d..2e20ca16 100644 --- a/src/extension/default_eventloop.c +++ b/src/extension/default_eventloop.c @@ -266,7 +266,7 @@ default_eventloop_run_once(getdns_eventloop *loop, int blocking) timeout = s->timeout_time; } - if ((timeout == (uint64_t)-1) && (num_pfds == 0)) + if ((timeout == TIMEOUT_FOREVER) && (num_pfds == 0)) return; pfds = calloc(num_pfds, sizeof(struct pollfd)); @@ -283,7 +283,10 @@ default_eventloop_run_once(getdns_eventloop *loop, int blocking) i++; } - if (! blocking || now > timeout) { + if (timeout == TIMEOUT_FOREVER) { + poll_timeout = -1; + } + else if (! blocking || now > timeout) { poll_timeout = 0; } else { poll_timeout = (timeout - now) * 1000; /* turn seconds into millseconds */