Merge branch 'master' of ozlabs.org:ccan

[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 cc1857c57a8bad386e804328a889e264a7220761..7ecccc7412cd2aa3f2b5342614a695168e5e46d9 100644 (file)
--- a/ccan/io/test/run-03-readpartial.c
+++ b/ccan/io/test/run-03-readpartial.c
@@ -6,25 +6,32 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65003"
+#endif
+
 struct data {
        int state;
        size_t bytes;
        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++;
-       d->bytes = sizeof(d->buf);
-       return io_read_partial(d->buf, &d->bytes, 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);
+       d->bytes = sizeof(d->buf);
+
+       io_set_finish(io_new_conn(fd,
+                                 io_read_partial(d->buf, &d->bytes, io_close_cb, d)),
+                     finish_ok, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -87,9 +94,9 @@ int main(void)
        /* This is how many tests you plan to run */
        plan_tests(22);
        d->state = 0;
-       fd = make_listen_fd("65003", &addrinfo);
+       fd = make_listen_fd(PORT, &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()) {