ccan/io: eliminate dir argument from io_wait and io_always.

[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 327fa956da687571d92eaf824120cba7531bce51..1f69e9f51bb17e3e2aae58075adf5d3a6c8d7d34 100644 (file)
--- a/ccan/io/test/run-07-break.c
+++ b/ccan/io/test/run-07-break.c
@@ -6,29 +6,37 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65007"
+#endif
+
 struct data {
        int state;
        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(conn, d->buf, sizeof(d->buf), io_close, d);
+       return io_close(conn);
 }
 
-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(conn, d, do_read, d);
 }
 
-static void finish_ok(struct io_conn *conn, struct data *d)
+static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 {
-       ok1(d->state == 2);
+       ok1(d->state == 0);
        d->state++;
+
+       io_set_finish(conn, finish_ok, d);
+
+       io_break(d);
+       return io_read(conn, d->buf, sizeof(d->buf), read_done, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -73,9 +81,9 @@ int main(void)
        /* This is how many tests you plan to run */
        plan_tests(13);
        d->state = 0;
-       fd = make_listen_fd("65007", &addrinfo);
+       fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, start_break, finish_ok, d);
+       l = io_new_listener(NULL, fd, init_conn, d);
        ok1(l);
        fflush(stdout);
        if (!fork()) {