X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-02-read.c;h=c7a7eaf1c338704ad42cbcd3c6f7796377521134;hp=abc66463c74eaee691e536d4c2052002f13c3bd3;hb=5a510ed5696255910fd42adb47d7c1ffa728a116;hpb=737705f0c2ec60ea5b51ca55299488d86db37b5d

diff --git a/ccan/io/test/run-02-read.c b/ccan/io/test/run-02-read.c
index abc66463..c7a7eaf1 100644
--- a/ccan/io/test/run-02-read.c
+++ b/ccan/io/test/run-02-read.c
@@ -6,29 +6,30 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65002"
+#endif
+
 struct data {
 	int state;
 	char buf[4];
 };
 
-static struct io_plan start_ok(struct io_conn *conn, struct data *d)
-{
-	ok1(d->state == 0);
-	d->state++;
-	return io_read(d->buf, sizeof(d->buf), 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_read(d->buf, sizeof(d->buf), io_close_cb, d)),
+		      finish_ok, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -73,7 +74,7 @@ int main(void)
 	/* This is how many tests you plan to run */
 	plan_tests(10);
 	d->state = 0;
-	fd = make_listen_fd("65002", &addrinfo);
+	fd = make_listen_fd(PORT, &addrinfo);
 	ok1(fd >= 0);
 	l = io_new_listener(fd, init_conn, d);
 	ok1(l);