ccan/io: remove io_state.

[ccan] / ccan / io / test / run-02-read.c

diff --git a/ccan/io/test/run-02-read.c b/ccan/io/test/run-02-read.c
index e59ccb38b275589fc9b9be640a5c1fb7dd81b0dd..9abcd9647b6fb7295e998ec9437f6ef4543ff29c 100644 (file)
--- a/ccan/io/test/run-02-read.c
+++ b/ccan/io/test/run-02-read.c
@@ -11,18 +11,21 @@ struct data {
        char buf[4];
 };
 
-static struct io_op *start_ok(struct io_conn *conn, struct data *d)
+static void finish_ok(struct io_conn *conn, struct data *d)
 {
-       ok1(d->state == 0);
+       ok1(d->state == 1);
        d->state++;
-       return io_read(d->buf, sizeof(d->buf), io_next(conn, io_close, d));
+       io_break(d, io_idle());
 }
 
-static void finish_ok(struct io_conn *conn, struct data *d)
+static void init_conn(int fd, struct data *d)
 {
-       ok1(d->state == 1);
+       ok1(d->state == 0);
        d->state++;
-       io_break(d, NULL);
+
+       if (!io_new_conn(fd, io_read(d->buf, sizeof(d->buf), io_close, d),
+                        finish_ok, d))
+               abort();
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -69,7 +72,7 @@ int main(void)
        d->state = 0;
        fd = make_listen_fd("65002", &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, start_ok, finish_ok, d);
+       l = io_new_listener(fd, init_conn, d);
        ok1(l);
        fflush(stdout);
        if (!fork()) {