X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-03-readpartial.c;h=2e2e8e16ed0892d4b7a952510f8f9004f3fb510b;hp=a24be7e025847b3e36bf4cf865cc11113e3a47f8;hb=96dcdfbf1a400f7cb43cf3f0761f52fd6de9ff65;hpb=57d9d1be33905691ec756b14b066181ca6850ced

diff --git a/ccan/io/test/run-03-readpartial.c b/ccan/io/test/run-03-readpartial.c
index a24be7e0..2e2e8e16 100644
--- a/ccan/io/test/run-03-readpartial.c
+++ b/ccan/io/test/run-03-readpartial.c
@@ -6,6 +6,8 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#define PORT "65003"
+
 struct data {
 	int state;
 	size_t bytes;
@@ -16,18 +18,18 @@ 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++;
-	d->bytes = sizeof(d->buf);
 
-	if (!io_new_conn(fd, io_read_partial(d->buf, &d->bytes, io_close, d),
-			 finish_ok, d))
-		abort();
+	io_set_finish(conn, finish_ok, d);
+
+	return io_read_partial(conn, d->buf, sizeof(d->buf), &d->bytes,
+			       io_close_cb, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -90,9 +92,9 @@ int main(void)
 	/* This is how many tests you plan to run */
 	plan_tests(22);
 	d->state = 0;
-	fd = make_listen_fd("65003", &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()) {
@@ -102,7 +104,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 <= sizeof(d->buf));
@@ -121,7 +123,7 @@ int main(void)
 		exit(0);
 	}
 	d->state = 0;
-	ok1(io_loop() == d);
+	ok1(io_loop(NULL, NULL) == d);
 	ok1(d->state == 2);
 	ok1(d->bytes > 0);
 	ok1(d->bytes <= strlen("hi"));