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

This has been renamed from signal::signal

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

---
 cmd/tcpserv/main.ha | 4 ++--
 ev/+linux/signal.ha | 8 ++++----

diff --git a/cmd/tcpserv/main.ha b/cmd/tcpserv/main.ha
index 1b95ac210c79da7a33538ef73b214ba0c51bcdce..c46e71ef5205fab10eb56f0c73519762b8b5403a 100644
--- a/cmd/tcpserv/main.ha
+++ b/cmd/tcpserv/main.ha
@@ -46,7 +46,7 @@ 	};
 	ev::setuser(sock, &state);
 	ev::accept(sock, &server_accept);
 
-	const sig = ev::signal(&loop, &signal, signal::SIGINT, signal::SIGTERM)!;
+	const sig = ev::signal(&loop, &signal, signal::sig::INT, signal::sig::TERM)!;
 	defer ev::close(sig);
 	ev::setuser(sig, &state);
 
@@ -55,7 +55,7 @@ 	for (ev::dispatch(&loop, -1)!) void;
 	os::exit(state.exit);
 };
 
-fn signal(file: *ev::file, sig: signal::signal) void = {
+fn signal(file: *ev::file, sig: signal::sig) void = {
 	log::printfln("Exiting due to {}", signal::signame(sig));
 	const server = ev::getuser(file): *server;
 	ev::stop(server.loop);
diff --git a/ev/+linux/signal.ha b/ev/+linux/signal.ha
index e5b344b13f0c8194bf0bc8b35d10c679730dd23e..ddfd07dd5cea4dc794dccf70953e302c0bb01895 100644
--- a/ev/+linux/signal.ha
+++ b/ev/+linux/signal.ha
@@ -4,7 +4,7 @@ use rt;
 use unix::signal;
 
 // Callback function for [[signal]] operations.
-export type signalcb = fn(file: *file, sig: signal::signal) void;
+export type signalcb = fn(file: *file, sig: signal::sig) void;
 
 // Registers a signal handler with this event loop. The signals specified will
 // be masked so they are only raised via the provided callback. Closing this
@@ -16,7 +16,7 @@ // signals.
 export fn signal(
 	loop: *loop,
 	cb: *signalcb,
-	signals: signal::signal...
+	signals: signal::sig...
 ) (*file | errors::error) = {
 	const fd = signal::signalfd(signals...)?;
 	const file = register(loop, fd)?;
@@ -31,10 +31,10 @@ };
 
 fn signal_restore(file: *file) void = {
 	assert(file.op == op::SIGNAL);
-	let buf: [rt::NSIG]signal::signal = [0...];
+	let buf: [rt::NSIG]signal::sig = [0...];
 	let signals = buf[..0];
 	for (let i = 1; i < rt::NSIG; i += 1) {
-		const sig = i: signal::signal;
+		const sig = i: signal::sig;
 		if (signal::sigset_member(&file.sigmask, sig)) {
 			static append(signals, sig);
 		};

-- 
2.48.1