X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fevent.h;h=8a61e81b2d20899d859b41f8fa21e348a90b6881;hb=be83b0af60449c7b35d17d97f2e6dc12f611e831;hp=cf3c70a163b531b331bef39a9b797d8cff53d875;hpb=61d9b04f66055e61f0afdf8955ff890f4da39288;p=meshlink

diff --git a/src/event.h b/src/event.h
index cf3c70a1..8a61e81b 100644
--- a/src/event.h
+++ b/src/event.h
@@ -35,46 +35,46 @@ typedef void (*signal_cb_t)(event_loop_t *loop, void *data);
 typedef struct timeval(*idle_cb_t)(event_loop_t *loop, void *data);
 
 typedef struct io_t {
+	struct splay_node_t node;
 	int fd;
 	int flags;
 	io_cb_t cb;
 	void *data;
-	struct splay_node_t node;
 } io_t;
 
 typedef struct timeout_t {
+	struct splay_node_t node;
 	struct timeval tv;
 	timeout_cb_t cb;
 	void *data;
-	struct splay_node_t node;
 } timeout_t;
 
 typedef struct signal_t {
+	struct splay_node_t node;
 	int signum;
 	signal_cb_t cb;
 	void *data;
-	struct splay_node_t node;
 } signal_t;
 
 struct event_loop_t {
-	fd_set readfds;
-	fd_set writefds;
+	void *data;
 
 	volatile bool running;
-	struct timeval now;
 	bool deletion;
 
-	splay_tree_t ios;
-	splay_tree_t timeouts;
-	splay_tree_t signals;
+	struct timeval now;
 
+	splay_tree_t timeouts;
 	idle_cb_t idle_cb;
 	void *idle_data;
+	splay_tree_t ios;
+	splay_tree_t signals;
+
+	fd_set readfds;
+	fd_set writefds;
 
 	io_t signalio;
 	int pipefd[2];
-
-	void *data;
 };
 
 extern void io_add(event_loop_t *loop, io_t *io, io_cb_t cb, void *data, int fd, int flags);
@@ -93,7 +93,7 @@ extern void idle_set(event_loop_t *loop, idle_cb_t cb, void *data);
 
 extern void event_loop_init(event_loop_t *loop);
 extern void event_loop_exit(event_loop_t *loop);
-extern bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex);
+extern bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) __attribute__((__warn_unused_result__));
 extern void event_loop_flush_output(event_loop_t *loop);
 extern void event_loop_start(event_loop_t *loop);
 extern void event_loop_stop(event_loop_t *loop);