X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fevent.c;h=a1801723cc5cb7de25e1c102258a0f80500983b9;hb=9e917cc3b614d7a986416e6a2c3ea9ea583adacf;hp=8c7de4799e95f570d858d6a063585d018627a85f;hpb=a742ea4d040ecfaabbc875c63f2625654ce68923;p=tinc diff --git a/src/event.c b/src/event.c index 8c7de479..a1801723 100644 --- a/src/event.c +++ b/src/event.c @@ -1,6 +1,6 @@ /* event.c -- I/O, timeout and signal event handling - Copyright (C) 2012-2013 Guus Sliepen + Copyright (C) 2012-2021 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,12 +18,8 @@ */ #include "system.h" - -#include "dropin.h" #include "event.h" -#include "net.h" #include "utils.h" -#include "xalloc.h" struct timeval now; @@ -237,6 +233,8 @@ static void signal_handler(int signum) { } static void signalio_handler(void *data, int flags) { + (void)data; + (void)flags; unsigned char signum; if(read(pipefd[0], &signum, 1) != 1) { @@ -376,7 +374,7 @@ bool event_loop(void) { while(running) { struct timeval diff; struct timeval *tv = get_time_remaining(&diff); - DWORD timeout_ms = tv ? (tv->tv_sec * 1000 + tv->tv_usec / 1000 + 1) : WSA_INFINITE; + DWORD timeout_ms = tv ? (DWORD)(tv->tv_sec * 1000 + tv->tv_usec / 1000 + 1) : WSA_INFINITE; if(!event_count) { Sleep(timeout_ms); @@ -434,7 +432,7 @@ bool event_loop(void) { } if(result < WSA_WAIT_EVENT_0 || result >= WSA_WAIT_EVENT_0 + event_count - event_offset) { - return(false); + return false; } /* Look up io in the map by index. */