Merge branch 'io'

[ccan] / ccan / io / test / run-17-homemade-io.c

diff --git a/ccan/io/test/run-17-homemade-io.c b/ccan/io/test/run-17-homemade-io.c
index de7ce7510d9915e4c2637a5e1dfb06b62aa773cb..b827713a789209f27bbac586ebfbe80aedfeed0c 100644 (file)
--- a/ccan/io/test/run-17-homemade-io.c
+++ b/ccan/io/test/run-17-homemade-io.c
@@ -41,7 +41,7 @@ static int do_read_packet(int fd, struct io_plan *plan)
                ok1(pkt->state == 2);
                pkt->state++;
                if (pkt->len == 0)
-                       return 1;
+                       return io_debug_io(1);
                if (!pkt->contents && !(pkt->contents = malloc(pkt->len)))
                        goto fail;
                else {
@@ -58,12 +58,12 @@ static int do_read_packet(int fd, struct io_plan *plan)
        plan->u.ptr_len.len += ret;
 
        /* Finished? */
-       return (plan->u.ptr_len.len >= sizeof(pkt->len)
-               && plan->u.ptr_len.len == pkt->len + sizeof(pkt->len));
+       return io_debug_io(plan->u.ptr_len.len >= sizeof(pkt->len)
+                          && plan->u.ptr_len.len == pkt->len + sizeof(pkt->len));
 
 fail:
        free(pkt->contents);
-       return -1;
+       return io_debug_io(-1);
 }
 
 static struct io_plan io_read_packet(struct packet *pkt,
@@ -81,7 +81,6 @@ static struct io_plan io_read_packet(struct packet *pkt,
        plan.next_arg = arg;
        plan.pollflag = POLLIN;
 
-       io_plan_debug(&plan);
        return plan;
 }
 
@@ -90,7 +89,7 @@ static void init_conn(int fd, struct packet *pkt)
        ok1(pkt->state == 0);
        pkt->state++;
 
-       io_set_finish(io_new_conn(fd, io_read_packet(pkt, io_close, pkt)),
+       io_set_finish(io_new_conn(fd, io_read_packet(pkt, io_close_cb, pkt)),
                      finish_ok, pkt);
 }