io: change io_idle() to io_wait()

[ccan] / ccan / io / test / run-06-idle.c

diff --git a/ccan/io/test/run-06-idle.c b/ccan/io/test/run-06-idle.c
index 388805a882b4bb31bccfc44790d694a8f1f5a641..82f6e0af6851af408a9741c1e9a42fb04da95792 100644 (file)
--- a/ccan/io/test/run-06-idle.c
+++ b/ccan/io/test/run-06-idle.c
@@ -24,12 +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)
 {
-       io_wake(idler, io_read(d->buf, sizeof(d->buf), read_done, d));
+       io_wake(d);
        ok1(d->state == 1);
        d->state++;
 }
@@ -38,7 +38,7 @@ static void finish_idle(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 3);
        d->state++;
-       io_break(d, io_idle());
+       io_break(d, io_never());
 }
 
 static struct io_plan never(struct io_conn *conn, void *arg)
@@ -46,18 +46,25 @@ static struct io_plan never(struct io_conn *conn, void *arg)
        abort();
 }
 
+static struct io_plan read_buf(struct io_conn *conn, struct data *d)
+{
+       return io_read(d->buf, sizeof(d->buf), read_done, d);
+}
+
 static void init_conn(int fd, struct data *d)
 {
        int fd2;
 
        ok1(d->state == 0);
        d->state++;
-       idler = io_new_conn(fd, io_idle(), finish_idle, d);
+       idler = io_new_conn(fd, io_wait(d, read_buf, d));
+       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)
@@ -100,7 +107,7 @@ int main(void)
        int fd, status;
 
        /* This is how many tests you plan to run */
-       plan_tests(14);
+       plan_tests(13);
        d->state = 0;
        fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);