ccan/io: get rid of io_next(), pass callbacks directly.

[ccan] / ccan / io / test / run-15-timeout.c

diff --git a/ccan/io/test/run-15-timeout.c b/ccan/io/test/run-15-timeout.c
index e8897c95759e3f3a58ce1905d321fd162d19776a..510a97203865af538352ef233d0486f8562d5c60 100644 (file)
--- a/ccan/io/test/run-15-timeout.c
+++ b/ccan/io/test/run-15-timeout.c
@@ -35,14 +35,14 @@ static struct io_plan *start_ok(struct io_conn *conn, struct data *d)
        ok1(d->state == 0);
        d->state++;
        io_timeout(conn, time_from_usec(d->timeout_usec), timeout, d);
-       return io_read(d->buf, sizeof(d->buf), io_next(conn, no_timeout, d));
+       return io_read(conn, d->buf, sizeof(d->buf), no_timeout, d);
 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 2);
        d->state++;
-       io_break(d, NULL);
+       io_break(conn, d, NULL, NULL);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)