ccan/io: rewrite.

[ccan] / ccan / io / test / run-03-readpartial.c

diff --git a/ccan/io/test/run-03-readpartial.c b/ccan/io/test/run-03-readpartial.c
index 5e08b1a2709347af6131af10c54692f5edeaf2d9..7b3606385f8d0255635bc1128b5739deb880ec97 100644 (file)
--- a/ccan/io/test/run-03-readpartial.c
+++ b/ccan/io/test/run-03-readpartial.c
@@ -20,18 +20,18 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 1);
        d->state++;
-       io_break(d, io_idle());
+       io_break(d);
 }
 
-static void init_conn(int fd, struct data *d)
+static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 0);
        d->state++;
-       d->bytes = sizeof(d->buf);
 
-       if (!io_new_conn(fd, io_read_partial(d->buf, &d->bytes, io_close, d),
-                        finish_ok, d))
-               abort();
+       io_set_finish(conn, finish_ok, d);
+
+       return io_read_partial(conn, d->buf, sizeof(d->buf), &d->bytes,
+                              io_close_cb, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -96,7 +96,7 @@ int main(void)
        d->state = 0;
        fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, init_conn, d);
+       l = io_new_listener(NULL, fd, init_conn, d);
        ok1(l);
        fflush(stdout);
        if (!fork()) {