From b6e30b577721f9fe19933918a67961f5991ec23b Mon Sep 17 00:00:00 2001
From: francorbacho <francorbacho@proton.me>
Date: Wed, 30 Aug 2023 10:31:04 +0000
Subject: [PATCH] *void -> *opaque

---
 cmd/tcpclient/main.ha |  2 +-
 ev/+linux/file.ha     | 12 ++++++------
 ev/+linux/socket.ha   | 10 +++++-----

diff --git a/cmd/tcpclient/main.ha b/cmd/tcpclient/main.ha
index 00af0fd338a1109956bbe7bb5ccf7b9737daa9f8..74635cb324818779ae5f1c1126d88cfbfaeb3bc4 100644
--- a/cmd/tcpclient/main.ha
+++ b/cmd/tcpclient/main.ha
@@ -42,7 +42,7 @@
 	for (ev::dispatch(&loop, -1)!) void;
 };
 
-fn connected(result: (*ev::file | net::error), user: nullable *void) void = {
+fn connected(result: (*ev::file | net::error), user: nullable *opaque) void = {
 	const state = user: *state;
 	const sock = match (result) {
 	case let err: net::error =>
diff --git a/ev/+linux/file.ha b/ev/+linux/file.ha
index 303404bf2a54d49aaa3b59ffccad9983f8b47669..ee2c0fe29fd9433441ef5899d29ea8899de90f9a 100644
--- a/ev/+linux/file.ha
+++ b/ev/+linux/file.ha
@@ -33,9 +33,9 @@ 	ev: *loop,
 
 	flags: fflags,
 	op: op,
-	cb: nullable *void,
-	cb2: nullable *void,
-	user: nullable *void,
+	cb: nullable *opaque,
+	cb2: nullable *opaque,
+	user: nullable *opaque,
 
 	// Operation-specific data
 	union {
@@ -118,14 +118,14 @@ 	io::close(fd)!;
 };
 
 // Sets the user data field on this file object to the provided object.
-export fn setuser(file: *file, user: nullable *void) void = {
+export fn setuser(file: *file, user: nullable *opaque) void = {
 	file.user = user;
 };
 
 // Returns the user data field from this file object. If the field was null, an
 // assertion is raised.
-export fn getuser(file: *file) *void = {
-	return file.user as *void;
+export fn getuser(file: *file) *opaque = {
+	return file.user as *opaque;
 };
 
 // Returns the file descriptor for a given file. Note that ev assumes that it
diff --git a/ev/+linux/socket.ha b/ev/+linux/socket.ha
index fb2533b95310b702e6e6197e5c12c01070407664..a3b9a165dd1756df7ec2eb7f9c8967036989bc74 100644
--- a/ev/+linux/socket.ha
+++ b/ev/+linux/socket.ha
@@ -42,7 +42,7 @@ 	const file = register(loop, sock)?;
 	return file;
 };
 
-export type connectcb = fn(result: (*file | net::error), user: nullable *void) void;
+export type connectcb = fn(result: (*file | net::error), user: nullable *opaque) void;
 
 // Creates a socket and connects to a given IP address and port over TCP.
 //
@@ -54,7 +54,7 @@ //
 //	let user: state = // ...
 // 	ev::connect_tcp(&loop, &connected, addr, port, &user);
 //
-// 	fn connected(result: (*ev::file | net::error), user: nullable *void) void = {
+// 	fn connected(result: (*ev::file | net::error), user: nullable *opaque) void = {
 // 		let user = user: *state;
 // 	};
 //
@@ -69,16 +69,16 @@ 	loop: *loop,
 	cb: *connectcb,
 	addr: ip::addr,
 	port: u16,
-	opts: (net::sockflag | *void)...
+	opts: (net::sockflag | *opaque)...
 ) (void | net::error | errors::error) = {
 	// XXX: This doesn't let us set keepalive
 	let opt: net::sockflag = 0;
-	let user: nullable *void = null;
+	let user: nullable *opaque = null;
 	for (let i = 0z; i < len(opts); i += 1) {
 		match (opts[i]) {
 		case let o: net::sockflag =>
 			opt |= o;
-		case let u: *void =>
+		case let u: *opaque =>
 			assert(user == null);
 			user = u;
 		};

-- 
2.48.1