ccan/io: remove io_state.

[ccan] / ccan / io / test / run-07-break.c

diff --git a/ccan/io/test/run-07-break.c b/ccan/io/test/run-07-break.c
index 7e9824d5a8ef0185611043dffcd07b52da7484c6..5a6e9701b52ca3d2c9567c096ebe02bd3c83458c 100644 (file)
--- a/ccan/io/test/run-07-break.c
+++ b/ccan/io/test/run-07-break.c
@@ -11,24 +11,29 @@ struct data {
        char buf[4];
 };
 
-static struct io_plan *do_read(struct io_conn *conn, struct data *d)
+static struct io_plan read_done(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 1);
        d->state++;
-       return io_read(d->buf, sizeof(d->buf), io_next(conn, io_close, d));
+       return io_close(conn, NULL);
 }
 
-static struct io_plan *start_break(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 == 2);
        d->state++;
-       return io_break(d, io_next(conn, do_read, d));
 }
 
-static void finish_ok(struct io_conn *conn, struct data *d)
+static void init_conn(int fd, struct data *d)
 {
-       ok1(d->state == 2);
+       ok1(d->state == 0);
        d->state++;
+
+       if (!io_new_conn(fd,
+                        io_break(d,
+                                 io_read(d->buf, sizeof(d->buf), read_done, d)),
+                        finish_ok, d))
+               abort();
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -75,7 +80,7 @@ int main(void)
        d->state = 0;
        fd = make_listen_fd("65007", &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, start_break, finish_ok, d);
+       l = io_new_listener(fd, init_conn, d);
        ok1(l);
        fflush(stdout);
        if (!fork()) {