interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace ((uint64_t)-1) with TIMEOUT_FOREVER

This commit is contained in:
Willem Toorop 2016-12-08 14:44:24 +01:00
parent 3629d558cd
commit 743e04bfd6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/extension/default_eventloop.c
View File

@ -27,6 +27,7 @@
#include "extension/default_eventloop.h" #include "extension/default_eventloop.h"
#include "debug.h" #include "debug.h"
#include "types-internal.h"
static uint64_t get_now_plus(uint64_t amount) static uint64_t get_now_plus(uint64_t amount)
{ {
@ -40,7 +41,7 @@ static uint64_t get_now_plus(uint64_t amount)
now = tv.tv_sec * 1000000 + tv.tv_usec; now = tv.tv_sec * 1000000 + tv.tv_usec;
return (now + amount * 1000) >= now return (now + amount * 1000) >= now
? now + amount * 1000 : 0xFFFFFFFFFFFFFFFF; ? now + amount * 1000 : TIMEOUT_FOREVER;
} }
static getdns_return_t static getdns_return_t
@ -183,7 +184,7 @@ default_eventloop_run_once(getdns_eventloop *loop, int blocking)
fd_set readfds, writefds; fd_set readfds, writefds;
int fd, max_fd = -1; int fd, max_fd = -1;
uint64_t now, timeout = 0xFFFFFFFFFFFFFFFF; uint64_t now, timeout = TIMEOUT_FOREVER;
size_t i; size_t i;
struct timeval tv; struct timeval tv;
@ -214,7 +215,7 @@ default_eventloop_run_once(getdns_eventloop *loop, int blocking)
if (default_loop->fd_timeout_times[fd] < timeout) if (default_loop->fd_timeout_times[fd] < timeout)
timeout = default_loop->fd_timeout_times[fd]; timeout = default_loop->fd_timeout_times[fd];
} }
if (max_fd == -1 && timeout == 0xFFFFFFFFFFFFFFFF) if (max_fd == -1 && timeout == TIMEOUT_FOREVER)
return; return;
if (! blocking || now > timeout) { if (! blocking || now > timeout) {
@ -225,7 +226,7 @@ default_eventloop_run_once(getdns_eventloop *loop, int blocking)
tv.tv_usec = (timeout - now) % 1000000; tv.tv_usec = (timeout - now) % 1000000;
} }
if (select(max_fd + 1, &readfds, &writefds, NULL, if (select(max_fd + 1, &readfds, &writefds, NULL,
(timeout == 0xFFFFFFFFFFFFFFFF ? NULL : &tv)) < 0) { (timeout == TIMEOUT_FOREVER ? NULL : &tv)) < 0) {
perror("select() failed"); perror("select() failed");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

2
src/ub_loop.c
View File

@ -414,7 +414,7 @@ static struct ub_event* my_event_new(struct ub_event_base* base, int fd,
ev->added = 0; ev->added = 0;
ev->fd = fd; ev->fd = fd;
ev->bits = bits; ev->bits = bits;
ev->timeout = 0xFFFFFFFFFFFFFFFF; ev->timeout = TIMEOUT_FOREVER;
ev->cb = cb; ev->cb = cb;
ev->arg = arg; ev->arg = arg;
#ifdef USE_WINSOCK #ifdef USE_WINSOCK