io: remove io_debug support.

[ccan] / ccan / io / test / run-04-writepartial.c

diff --git a/ccan/io/test/run-04-writepartial.c b/ccan/io/test/run-04-writepartial.c
index 87fa8d9d0b22fef5b01da4d9d51473e602b4fada..947f01e576af9e115123eabd777b2cd6280561f8 100644 (file)
--- a/ccan/io/test/run-04-writepartial.c
+++ b/ccan/io/test/run-04-writepartial.c
@@ -6,24 +6,29 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#define PORT "65004"
+
 struct data {
        int state;
        size_t bytes;
        char *buf;
 };
 
-static struct io_plan *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++;
-       return io_write_partial(conn, d->buf, &d->bytes, io_close, d);
+       io_break(d);
 }
 
-static void finish_ok(struct io_conn *conn, struct data *d)
+static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 {
-       ok1(d->state == 1);
+       ok1(d->state == 0);
        d->state++;
-       io_break(conn, d, NULL, NULL);
+       io_set_finish(conn, finish_ok, d);
+
+       return io_write_partial(conn, d->buf, d->bytes, &d->bytes,
+                               io_close_cb, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -89,9 +94,9 @@ int main(void)
        d->bytes = 1024*1024;
        d->buf = malloc(d->bytes);
        memset(d->buf, 'a', d->bytes);
-       fd = make_listen_fd("65004", &addrinfo);
+       fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, start_ok, finish_ok, d);
+       l = io_new_listener(NULL, fd, init_conn, d);
        ok1(l);
        fflush(stdout);
        if (!fork()) {
@@ -102,7 +107,7 @@ int main(void)
                free(d);
                exit(0);
        }
-       ok1(io_loop() == d);
+       ok1(io_loop(NULL, NULL) == d);
        ok1(d->state == 2);
        ok1(d->bytes > 0);
        ok1(d->bytes <= 1024*1024);