From d97bae0470afe6a3930eac593e016cae704703f5 Mon Sep 17 00:00:00 2001
From: Willow Barraco <contact@willowbarraco.fr>
Date: Sat, 29 Jul 2023 14:15:28 +0200
Subject: [PATCH] Bump net::sockflag usage

The enum has been renamed from net::sockflags.

Signed-off-by: Willow Barraco <contact@willowbarraco.fr>

---
 ev/+linux/file.ha   |  2 +-
 ev/+linux/socket.ha | 18 +++++++++---------

diff --git a/ev/+linux/file.ha b/ev/+linux/file.ha
index 656f382ed352673e5917e4089c43091849e8deca..76b58007952d1c6771b43c32f434283b67c87e4d 100644
--- a/ev/+linux/file.ha
+++ b/ev/+linux/file.ha
@@ -45,7 +45,7 @@ 			rvec: []rt::iovec,
 			wvbuf: rt::iovec,
 			wvec: []rt::iovec,
 		},
-		sockflags: net::sockflags,
+		sockflag: net::sockflag,
 		sigmask: signal::sigset,
 		sendrecv: struct {
 			sbuf: []u8,
diff --git a/ev/+linux/socket.ha b/ev/+linux/socket.ha
index 62c3c252eb4cd196b6fa15e94f29050465967956..fb2533b95310b702e6e6197e5c12c01070407664 100644
--- a/ev/+linux/socket.ha
+++ b/ev/+linux/socket.ha
@@ -46,7 +46,7 @@ export type connectcb = fn(result: (*file | net::error), user: nullable *void) void;
 
 // Creates a socket and connects to a given IP address and port over TCP.
 //
-// The variadic arguments accept [[net::sockflags]] and/or no more than one user
+// The variadic arguments accept [[net::sockflag]] and/or no more than one user
 // data pointer. If the user data pointer is provided, it will be passed to the
 // callback. This allows the user to pass a state object through the connection
 // process:
@@ -69,21 +69,21 @@ 	loop: *loop,
 	cb: *connectcb,
 	addr: ip::addr,
 	port: u16,
-	opts: (net::sockflags | *void)...
+	opts: (net::sockflag | *void)...
 ) (void | net::error | errors::error) = {
 	// XXX: This doesn't let us set keepalive
-	let opt: net::sockflags = 0;
+	let opt: net::sockflag = 0;
 	let user: nullable *void = null;
 	for (let i = 0z; i < len(opts); i += 1) {
 		match (opts[i]) {
-		case let o: net::sockflags =>
+		case let o: net::sockflag =>
 			opt |= o;
 		case let u: *void =>
 			assert(user == null);
 			user = u;
 		};
 	};
-	const sock = tcp::connect(addr, port, opt | net::sockflags::NONBLOCK)?;
+	const sock = tcp::connect(addr, port, opt | net::sockflag::NONBLOCK)?;
 	let file = register(loop, sock)?;
 	file.user = user;
 	file.cb = cb;
@@ -123,16 +123,16 @@ // Schedules an accept operation on a socket.
 export fn accept(
 	sock: *file,
 	cb: *acceptcb,
-	flags: net::sockflags...
+	flags: net::sockflag...
 ) req = {
 	assert(sock.op == op::NONE);
-	let fl: net::sockflags = 0;
+	let fl: net::sockflag = 0;
 	for (let i = 0z; i < len(flags); i += 1) {
 		fl |= flags[i];
 	};
 	sock.op = op::ACCEPT;
 	sock.cb = cb;
-	sock.sockflags = fl;
+	sock.sockflag = fl;
 	file_epoll_ctl(sock);
 	return req { ... };
 };
@@ -148,7 +148,7 @@ 	const cb = sock.cb: *acceptcb;
 	sock.op = op::NONE;
 	file_epoll_ctl(sock);
 
-	const r = tcp::accept(sock.fd, sock.sockflags);
+	const r = tcp::accept(sock.fd, sock.sockflag);
 	match (r) {
 	case let fd: net::socket =>
 		// TODO: Bubble up errors from here?

-- 
2.48.1