From 16f73fa6cc7426276bc4bd0cc8537d08c64cbc83 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Jun 2011 13:26:49 +0100 Subject: [PATCH] event loop: remove now parameter from site_settimeout This is now available as a global variable. Signed-off-by: Ian Jackson --- site.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/site.c b/site.c index b81f910..8a2d69a 100644 --- a/site.c +++ b/site.c @@ -932,8 +932,7 @@ static void enter_state_wait(struct site *st) /* XXX Erase keys etc. */ } -static inline void site_settimeout(uint64_t timeout, uint64_t *now, - int *timeout_io) +static inline void site_settimeout(uint64_t timeout, int *timeout_io) { if (timeout) { int64_t offset=timeout-*now; @@ -955,8 +954,8 @@ static int site_beforepoll(void *sst, struct pollfd *fds, int *nfds_io, /* Work out when our next timeout is. The earlier of 'timeout' or 'current_key_timeout'. A stored value of '0' indicates no timeout active. */ - site_settimeout(st->timeout, now, timeout_io); - site_settimeout(st->current_key_timeout, now, timeout_io); + site_settimeout(st->timeout, timeout_io); + site_settimeout(st->current_key_timeout, timeout_io); return 0; /* success */ } -- 2.30.2