ccan/io: go linear for debugging.

[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 a7d0ae3161aa674cc7b22a23ec16c1148cb1cca8..5e08b1a2709347af6131af10c54692f5edeaf2d9 100644 (file)
--- a/ccan/io/test/run-03-readpartial.c
+++ b/ccan/io/test/run-03-readpartial.c
@@ -6,30 +6,31 @@
 #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_plan start_ok(struct io_conn *conn, struct data *d)
-{
-       ok1(d->state == 0);
-       d->state++;
-       d->bytes = sizeof(d->buf);
-       return io_read_partial(d->buf, &d->bytes, io_close, d);
-}
-
 static void finish_ok(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 1);
        d->state++;
-       io_break(d, NULL, NULL);
+       io_break(d, io_idle());
 }
 
 static void init_conn(int fd, struct data *d)
 {
-       if (!io_new_conn(fd, start_ok, finish_ok, d))
+       ok1(d->state == 0);
+       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();
 }
 
@@ -93,7 +94,7 @@ 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, init_conn, d);
        ok1(l);