X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-05-write.c;h=2c3e1839991b3ef927ac24cd7b3ac5ad658a80fc;hp=e878c33054776e00406488e00a04e17aeecf8e3a;hb=cdf62dce7077a9f9a818edbb67d31d033cbb73c6;hpb=57d9d1be33905691ec756b14b066181ca6850ced

diff --git a/ccan/io/test/run-05-write.c b/ccan/io/test/run-05-write.c
index e878c330..2c3e1839 100644
--- a/ccan/io/test/run-05-write.c
+++ b/ccan/io/test/run-05-write.c
@@ -6,6 +6,10 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65005"
+#endif
+
 struct data {
 	int state;
 	size_t bytes;
@@ -16,16 +20,16 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 1);
 	d->state++;
-	io_break(d, io_idle());
+	io_break(d, io_never());
 }
 
 static void init_conn(int fd, struct data *d)
 {
 	ok1(d->state == 0);
 	d->state++;
-	if (!io_new_conn(fd, io_write(d->buf, d->bytes, io_close, d),
-			 finish_ok, d))
-		abort();
+	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)
@@ -94,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);