Merge branch 'master' of ozlabs.org:ccan

[ccan] / ccan / io / test / run-05-write.c

diff --git a/ccan/io/test/run-05-write.c b/ccan/io/test/run-05-write.c
index 3f0a8f98cb78b27dd75d8bcb1df8a5ef54d81f0c..5319def8f2cc28c6921b2b611a2c99b013b1402d 100644 (file)
--- a/ccan/io/test/run-05-write.c
+++ b/ccan/io/test/run-05-write.c
@@ -6,30 +6,30 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65005"
+#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(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))
-               abort();
+       ok1(d->state == 0);
+       d->state++;
+       io_set_finish(io_new_conn(fd, io_write(d->buf, d->bytes,
+                                              io_close_cb, d)),
+                     finish_ok, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -98,7 +98,7 @@ int main(void)
        d->bytes = 1024*1024;
        d->buf = malloc(d->bytes);
        memset(d->buf, 'a', d->bytes);
-       fd = make_listen_fd("65005", &addrinfo);
+       fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
        l = io_new_listener(fd, init_conn, d);
        ok1(l);