--- nono/util/autoserial/autoserial.cpp	2026/04/29 17:05:05	1.1.1.1
+++ nono/util/autoserial/autoserial.cpp	2026/04/29 17:05:09	1.1.1.2
@@ -21,11 +21,11 @@
 // ミリ秒単位になるようなスケール値とする
 #define DEFAULT_TIMESCALE (1000LL * 1000LL)
 
-long timescale = DEFAULT_TIMESCALE;
-bool opt_n = false;
+static long timescale = DEFAULT_TIMESCALE;
+static bool opt_n = false;
 
 [[noreturn]]
-void
+static void
 usage()
 {
 	printf(
@@ -39,7 +39,7 @@ usage()
 	exit(1);
 }
 
-void
+static void
 Do(FILE *fp, int tty_fd)
 {
 	autofd kq;
@@ -59,16 +59,13 @@ Do(FILE *fp, int tty_fd)
 	}
 
 	if (tty_fd >= 0) {
-		EV_SET(&kev, tty_fd, EVFILT_READ, EV_ADD, 0, 0, 0);
-		r = kevent_set(kq, &kev, 1);
+		r = kevent_add(kq, tty_fd, EVFILT_READ, EV_ADD, 0);
 		if (r == -1) {
-			err(1, "kevent_set");
+			err(1, "kevent_add(READ)");
 		}
-		EV_SET(&kev, tty_fd, EVFILT_WRITE, EV_ADD | EV_ONESHOT,
-			0, 0, (kevent_udata_t)1);
-		r = kevent_set(kq, &kev, 1);
+		r = kevent_add(kq, tty_fd, EVFILT_WRITE, EV_ADD | EV_ONESHOT, 1);
 		if (r == -1) {
-			err(1, "kevent_set");
+			err(1, "kevent_add(WRITE)");
 		}
 	}
 
@@ -135,7 +132,7 @@ Do(FILE *fp, int tty_fd)
 			break;
 		}
 
-		int udata = (int)kev.udata;
+		int udata = EV_UDATA2INT(kev.udata);
 		if (udata == 0) {
 			r = read(tty_fd, buf, 1);
 			if (r < 0) {