ccan/io: initialize connection with an explicit I/O plan.

[ccan] / ccan / io / test / run-01-start-finish.c

diff --git a/ccan/io/test/run-01-start-finish.c b/ccan/io/test/run-01-start-finish.c
index 03a1e3280bbb1d81908c2767854b4a017ef058e3..b5114abeafcceabe3b26d88581336e63b89ee582 100644 (file)
--- a/ccan/io/test/run-01-start-finish.c
+++ b/ccan/io/test/run-01-start-finish.c
@@ -6,18 +6,19 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
-static struct io_op *start_ok(struct io_conn *conn, int *state)
+static void finish_ok(struct io_conn *conn, int *state)
 {
-       ok1(*state == 0);
+       ok1(*state == 1);
        (*state)++;
-       return io_close(conn, NULL);
+       io_break(state + 1, io_idle());
 }
 
-static void finish_ok(struct io_conn *conn, int *state)
+static void init_conn(int fd, int *state)
 {
-       ok1(*state == 1);
+       ok1(*state == 0);
        (*state)++;
-       io_break(state + 1, NULL);
+       if (!io_new_conn(fd, io_close(NULL, NULL), finish_ok, state))
+               abort();
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -63,7 +64,7 @@ int main(void)
        plan_tests(9);
        fd = make_listen_fd("65001", &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, start_ok, finish_ok, &state);
+       l = io_new_listener(fd, init_conn, &state);
        ok1(l);
        fflush(stdout);
        if (!fork()) {