projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define WINVER before including any other header file on Windows.
[tinc]
/
src
/
event.c
diff --git
a/src/event.c
b/src/event.c
index
2fb65ec
..
99e6a23
100644
(file)
--- a/
src/event.c
+++ b/
src/event.c
@@
-30,8
+30,7
@@
extern time_t now;
int id;
int id;
-static int event_compare(const event_t *a, const event_t *b)
-{
+static int event_compare(const event_t *a, const event_t *b) {
if(a->time > b->time)
return 1;
if(a->time > b->time)
return 1;
@@
-41,22
+40,15
@@
static int event_compare(const event_t *a, const event_t *b)
return a->id - b->id;
}
return a->id - b->id;
}
-void init_events(void)
-{
- cp();
-
+void init_events(void) {
event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
}
event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
}
-void exit_events(void)
-{
- cp();
-
+void exit_events(void) {
avl_delete_tree(event_tree);
}
avl_delete_tree(event_tree);
}
-void expire_events(void)
-{
+void expire_events(void) {
avl_node_t *node;
event_t *event;
time_t diff;
avl_node_t *node;
event_t *event;
time_t diff;
@@
-66,8
+58,6
@@
void expire_events(void)
* the expiration time of the last event and the current time.
*/
* the expiration time of the last event and the current time.
*/
- cp();
-
if(!event_tree->tail)
return;
if(!event_tree->tail)
return;
@@
-83,41
+73,26
@@
void expire_events(void)
}
}
}
}
-event_t *new_event(void)
-{
- cp();
-
+event_t *new_event(void) {
return xmalloc_and_zero(sizeof(event_t));
}
return xmalloc_and_zero(sizeof(event_t));
}
-void free_event(event_t *event)
-{
- cp();
-
+void free_event(event_t *event) {
free(event);
}
free(event);
}
-void event_add(event_t *event)
-{
- cp();
-
+void event_add(event_t *event) {
event->id = ++id;
avl_insert(event_tree, event);
}
event->id = ++id;
avl_insert(event_tree, event);
}
-void event_del(event_t *event)
-{
- cp();
-
+void event_del(event_t *event) {
avl_delete(event_tree, event);
}
avl_delete(event_tree, event);
}
-event_t *get_expired_event(void)
-{
+event_t *get_expired_event(void) {
event_t *event;
event_t *event;
- cp();
-
if(event_tree->head) {
event = event_tree->head->data;
if(event_tree->head) {
event = event_tree->head->data;