Fix all spelling errors found by codespell.

[tinc] / src / event.c

diff --git a/src/event.c b/src/event.c
index 99e6a23..1223222 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -28,14 +28,16 @@
 avl_tree_t *event_tree;
 extern time_t now;
 
-int id;
+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;
 }
@@ -54,19 +56,22 @@ void expire_events(void) {
        time_t diff;
 
        /*
-        * Make all events appear expired by substracting the difference between
-         * the expiration time of the last event and the current time.
+        * Make all events appear expired by subtracting the difference between
+        * 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;
 
-       diff = 1 + event->time - now;
-       
        for(node = event_tree->head; node; node = node->next) {
                event = node->data;
                event->time -= diff;
@@ -96,7 +101,7 @@ event_t *get_expired_event(void) {
        if(event_tree->head) {
                event = event_tree->head->data;
 
-               if(event->time < now) {
+               if(event->time <= now) {
                        avl_node_t *node = event_tree->head;
                        avl_unlink_node(event_tree, node);
                        free(node);
@@ -106,3 +111,11 @@ event_t *get_expired_event(void) {
 
        return NULL;
 }
+
+event_t *peek_next_event(void) {
+       if(event_tree->head) {
+               return event_tree->head->data;
+       }
+
+       return NULL;
+}