event loop: remove now parameter from site_settimeout

This is now available as a global variable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/site.c b/site.c
index b81f9104dbe1470eb5ceb59a8b162ff1c6fcda6a..8a2d69ae5b5f713b28ab8099dea4c07b47e9657e 100644 (file)
--- a/site.c
+++ b/site.c
@@ -932,8 +932,7 @@ static void enter_state_wait(struct site *st)
     /* XXX Erase keys etc. */
 }
 
     /* 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;
 {
     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. */
     /* 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 */
 }
 
     return 0; /* success */
 }