Cleanups:

[tinc] / src / event.c

diff --git a/src/event.c b/src/event.c
index d11f91c..bc56dc1 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -1,7 +1,7 @@
 /*
     event.c -- event queue
-    Copyright (C) 2002 Guus Sliepen <guus@sliepen.warande.net>,
-                  2002 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2002 Guus Sliepen <guus@sliepen.eu.org>,
+                  2002 Ivo Timmermans <ivo@o2w.nl>
 
     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
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: event.c,v 1.1.4.1 2002/02/11 10:05:58 guus Exp $
+    $Id: event.c,v 1.1.4.4 2002/09/09 19:39:58 guus Exp $
 */
 
 #include "config.h"
@@ -34,6 +34,7 @@
 #include "system.h"
 
 avl_tree_t *event_tree;
+extern time_t now;
 
 int id;
 
@@ -48,62 +49,62 @@ int event_compare(event_t *a, event_t *b)
 
 void init_events(void)
 {
-cp
+  cp();
   event_tree = avl_alloc_tree((avl_compare_t)event_compare, NULL);
-cp
+  cp();
 }
 
 void exit_events(void)
 {
-cp
+  cp();
   avl_delete_tree(event_tree);
-cp
+  cp();
 }
 
 event_t *new_event(void)
 {
   event_t *event;
-cp
+  cp();
   event = (event_t *)xmalloc_and_zero(sizeof(*event));
-cp
+  cp();
   return event;
 }
 
 void free_event(event_t *event)
 {
-cp
+  cp();
   free(event);
-cp
+  cp();
 }
 
 void event_add(event_t *event)
 {
-cp
+  cp();
   event->id = ++id;
   avl_insert(event_tree, event);
-cp
+  cp();
 }
 
 void event_del(event_t *event)
 {
-cp
+  cp();
   avl_delete(event_tree, event);
-cp
+  cp();
 }
 
 event_t *get_expired_event(void)
 {
   event_t *event;
-cp
+  cp();
   if(event_tree->head)
   {
     event = (event_t *)event_tree->head->data;
-    if(event->time < time(NULL))
+    if(event->time < now)
     {
       avl_delete(event_tree, event);
       return event;
     }
   }
-cp  
+  cp();
   return NULL;
 }