X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-04-writepartial.c;h=011bbc894553b58699559655f6c37eeb7b6c2d1f;hb=94dd4c2bddd0dc080ad5b85465fa3f45f486967a;hp=12a21ddcd712e08fc793150380f8a8e0fefc17a4;hpb=57d9d1be33905691ec756b14b066181ca6850ced;p=ccan

diff --git a/ccan/io/test/run-04-writepartial.c b/ccan/io/test/run-04-writepartial.c
index 12a21ddc..011bbc89 100644
--- a/ccan/io/test/run-04-writepartial.c
+++ b/ccan/io/test/run-04-writepartial.c
@@ -6,6 +6,10 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65004"
+#endif
+
 struct data {
 	int state;
 	size_t bytes;
@@ -16,16 +20,17 @@ 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);
 }
 
-static void init_conn(int fd, struct data *d)
+static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 0);
 	d->state++;
-	if (!io_new_conn(fd, io_write_partial(d->buf, &d->bytes, io_close, d),
-			 finish_ok, d))
-		abort();
+	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)
@@ -91,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()) {
@@ -104,7 +109,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);