X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fevent.c;h=85b18f784c99ea740f7bb1bda622a5ca80dc53fe;hp=89ee02292f76b4d75c1acfa7ade864ea34c77459;hb=3fae14fae5a347823679ef694ab630b4991a201d;hpb=985d19caf20058db3c764f0f6fbeafa8bcc59fcc;ds=sidebyside diff --git a/src/event.c b/src/event.c index 89ee0229..85b18f78 100644 --- a/src/event.c +++ b/src/event.c @@ -31,11 +31,13 @@ extern time_t now; static int id; static int event_compare(const event_t *a, const event_t *b) { - if(a->time > b->time) + if(a->time > b->time) { return 1; + } - if(a->time < b->time) + if(a->time < b->time) { return -1; + } return a->id - b->id; } @@ -55,18 +57,21 @@ void expire_events(void) { /* * Make all events appear expired by substracting the difference between - * the expiration time of the last event and the current time. + * the expiration time of the last event and the current time. */ - if(!event_tree->tail) + if(!event_tree->tail) { return; + } event = event_tree->tail->data; - if(event->time <= now) + + if(event->time <= now) { return; + } diff = event->time - now; - + for(node = event_tree->head; node; node = node->next) { event = node->data; event->time -= diff; @@ -108,7 +113,9 @@ event_t *get_expired_event(void) { } event_t *peek_next_event(void) { - if (event_tree->head) + if(event_tree->head) { return event_tree->head->data; + } + return NULL; }