Merge branch 'master' of ozlabs.org:ccan

[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 9abcd9647b6fb7295e998ec9437f6ef4543ff29c..c7a7eaf1c338704ad42cbcd3c6f7796377521134 100644 (file)
--- a/ccan/io/test/run-02-read.c
+++ b/ccan/io/test/run-02-read.c
@@ -6,6 +6,10 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65002"
+#endif
+
 struct data {
        int state;
        char buf[4];
@@ -23,9 +27,9 @@ static void init_conn(int fd, struct data *d)
        ok1(d->state == 0);
        d->state++;
 
-       if (!io_new_conn(fd, io_read(d->buf, sizeof(d->buf), io_close, d),
-                        finish_ok, d))
-               abort();
+       io_set_finish(io_new_conn(fd,
+                                 io_read(d->buf, sizeof(d->buf), io_close_cb, d)),
+                     finish_ok, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -70,7 +74,7 @@ int main(void)
        /* This is how many tests you plan to run */
        plan_tests(10);
        d->state = 0;
-       fd = make_listen_fd("65002", &addrinfo);
+       fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
        l = io_new_listener(fd, init_conn, d);
        ok1(l);