X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-06-idle.c;h=455b8608f1cae1723763154a5bb918d1b5a46a11;hb=12ab811533406e22b78ce8b227474f1056375ae4;hp=388805a882b4bb31bccfc44790d694a8f1f5a641;hpb=34776d3e9ad7de78778306a2d09c2c95df06c902;p=ccan

diff --git a/ccan/io/test/run-06-idle.c b/ccan/io/test/run-06-idle.c
index 388805a8..455b8608 100644
--- a/ccan/io/test/run-06-idle.c
+++ b/ccan/io/test/run-06-idle.c
@@ -24,11 +24,12 @@ static struct io_plan read_done(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 2 || d->state == 3);
 	d->state++;
-	return io_close(conn, NULL);
+	return io_close();
 }
 
 static void finish_waker(struct io_conn *conn, struct data *d)
 {
+	ok1(io_is_idle(idler));
 	io_wake(idler, io_read(d->buf, sizeof(d->buf), read_done, d));
 	ok1(d->state == 1);
 	d->state++;
@@ -52,12 +53,14 @@ static void init_conn(int fd, struct data *d)
 
 	ok1(d->state == 0);
 	d->state++;
-	idler = io_new_conn(fd, io_idle(), finish_idle, d);
+	idler = io_new_conn(fd, io_idle());
+	io_set_finish(idler, finish_idle, d);
 
 	/* This will wake us up, as read will fail. */
 	fd2 = open("/dev/null", O_RDONLY);
 	ok1(fd2 >= 0);
-	ok1(io_new_conn(fd2, io_read(idler, 1, never, NULL), finish_waker, d));
+	io_set_finish(io_new_conn(fd2, io_read(idler, 1, never, NULL)),
+		      finish_waker, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)