ccan/io: eliminate dir argument from io_wait and io_always.

[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 11ac22a7c2fb79c125171fca873f2375f55eb257..4ca21a32a25d141c42c82959efea06994e3430f3 100644 (file)
--- a/ccan/io/test/run-04-writepartial.c
+++ b/ccan/io/test/run-04-writepartial.c
@@ -6,30 +6,31 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65004"
+#endif
+
 struct data {
        int state;
        size_t bytes;
        char *buf;
 };
 
-static struct io_plan start_ok(struct io_conn *conn, struct data *d)
-{
-       ok1(d->state == 0);
-       d->state++;
-       return io_write_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);
 }
 
-static void init_conn(int fd, struct data *d)
+static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 {
-       if (!io_new_conn(fd, start_ok, finish_ok, d))
-               abort();
+       ok1(d->state == 0);
+       d->state++;
+       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)
@@ -95,9 +96,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, init_conn, d);
+       l = io_new_listener(NULL, fd, init_conn, d);
        ok1(l);
        fflush(stdout);
        if (!fork()) {