about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-07-24 16:55:12 -0400
committerJune McEnroe <june@causal.agency>2018-07-24 16:55:12 -0400
commitfda4692bca6d9c6d63b48e1d3ffa3a2d73d6181a (patch)
tree886eb67a4f1920c18d3c9f1db5578e5ca1890af9
parentLink with -lcurses (diff)
downloadtorus-fda4692bca6d9c6d63b48e1d3ffa3a2d73d6181a.tar.gz
torus-fda4692bca6d9c6d63b48e1d3ffa3a2d73d6181a.zip
Use EV_SET
NetBSD kevent.udata is uintptr_t rather than void * and the macro does
the cast.
-rw-r--r--server.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/server.c b/server.c
index 0a8f365..89ba03c 100644
--- a/server.c
+++ b/server.c
@@ -338,11 +338,8 @@ int main() {
 	int kq = kqueue();
 	if (kq < 0) err(EX_OSERR, "kqueue");
 
-	struct kevent event = {
-		.ident = server,
-		.filter = EVFILT_READ,
-		.flags = EV_ADD,
-	};
+	struct kevent event;
+	EV_SET(&event, server, EVFILT_READ, EV_ADD, 0, 0, 0);
 	int nevents = kevent(kq, &event, 1, NULL, 0, NULL);
 	if (nevents < 0) err(EX_OSERR, "kevent");
 
@@ -361,12 +358,7 @@ int main() {
 
 			struct Client *client = clientAdd(fd);
 
-			struct kevent event = {
-				.ident = fd,
-				.filter = EVFILT_READ,
-				.flags = EV_ADD,
-				.udata = client,
-			};
+			EV_SET(&event, fd, EVFILT_READ, EV_ADD, 0, 0, client);
 			nevents = kevent(kq, &event, 1, NULL, 0, NULL);
 			if (nevents < 0) err(EX_IOERR, "kevent");
 
@@ -375,7 +367,7 @@ int main() {
 			continue;
 		}
 
-		struct Client *client = event.udata;
+		struct Client *client = (struct Client *)event.udata;
 		if (event.flags & EV_EOF) {
 			clientRemove(client);
 			continue;