Properly use the timeout_initialized() macro.

diff --git a/src/graph.c b/src/graph.c
index 02650f7330238d53487a83debfd45173fe0fd880..958947721f4446a4d2fd3eebf6dfbb5cb593e92c 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -376,7 +376,7 @@ void graph(void)
        sssp_bfs();
        mst_kruskal();
 
-       if(!ev.ev_callback)
+       if(!timeout_initialized(&ev))
                timeout_set(&ev, dump_graph, NULL);
        event_add(&ev, &(struct timeval){5, 0});
 }

diff --git a/src/net_packet.c b/src/net_packet.c
index 57794f98ccceef3371b387a49cedd685e602e7f6..84b2707d21e6780e8ce7930e68a1a1d2d681af5c 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -98,7 +98,7 @@ static void send_mtu_probe_handler(int fd, short events, void *data) {
 }
 
 void send_mtu_probe(node_t *n) {
-       if(!n->mtuevent.ev_callback)
+       if(!timeout_initialized(&n->mtuevent))
                timeout_set(&n->mtuevent, send_mtu_probe_handler, n);
        send_mtu_probe_handler(0, 0, n);
 }