X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-04-writepartial.c;h=5c1f5e015da50707999d77ee037b93853e8653bb;hp=11ac22a7c2fb79c125171fca873f2375f55eb257;hb=f7ab2c65d40839a327e50876dc2708ab7b11aa52;hpb=737705f0c2ec60ea5b51ca55299488d86db37b5d

diff --git a/ccan/io/test/run-04-writepartial.c b/ccan/io/test/run-04-writepartial.c
index 11ac22a7..5c1f5e01 100644
--- a/ccan/io/test/run-04-writepartial.c
+++ b/ccan/io/test/run-04-writepartial.c
@@ -6,30 +6,30 @@
 #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, io_never());
 }
 
 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_partial(d->buf, &d->bytes, io_close_cb, d)),
+				  finish_ok, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -95,7 +95,7 @@ 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);
 	ok1(l);