Merge branch 'io'

[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 a24be7e025847b3e36bf4cf865cc11113e3a47f8..7ecccc7412cd2aa3f2b5342614a695168e5e46d9 100644 (file)
--- a/ccan/io/test/run-03-readpartial.c
+++ b/ccan/io/test/run-03-readpartial.c
@@ -6,6 +6,10 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
 #include <sys/wait.h>
 #include <stdio.h>
 

+#ifndef PORT
+#define PORT "65003"
+#endif
+

 struct data {
        int state;
        size_t bytes;
 struct data {
        int state;
        size_t bytes;


@@ -25,9 +29,9 @@ static void init_conn(int fd, struct data *d)
        d->state++;
        d->bytes = sizeof(d->buf);
 
        d->state++;
        d->bytes = sizeof(d->buf);
 

-       if (!io_new_conn(fd, io_read_partial(d->buf, &d->bytes, io_close, d),
-                        finish_ok, d))
-               abort();
+       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)
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)


@@ -90,7 +94,7 @@ int main(void)
        /* This is how many tests you plan to run */
        plan_tests(22);
        d->state = 0;
        /* 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, init_conn, d);
        ok1(l);
        ok1(fd >= 0);
        l = io_new_listener(fd, init_conn, d);
        ok1(l);