X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-01-start-finish.c;h=53c07f24b4a07b0267953966b2a37af6242ea158;hp=03a1e3280bbb1d81908c2767854b4a017ef058e3;hb=737705f0c2ec60ea5b51ca55299488d86db37b5d;hpb=0a2fd289c7bf57d9fc35ad6af36df4bcc694f361

diff --git a/ccan/io/test/run-01-start-finish.c b/ccan/io/test/run-01-start-finish.c
index 03a1e328..53c07f24 100644
--- a/ccan/io/test/run-01-start-finish.c
+++ b/ccan/io/test/run-01-start-finish.c
@@ -6,7 +6,7 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
-static struct io_op *start_ok(struct io_conn *conn, int *state)
+static struct io_plan start_ok(struct io_conn *conn, int *state)
 {
 	ok1(*state == 0);
 	(*state)++;
@@ -17,7 +17,13 @@ static void finish_ok(struct io_conn *conn, int *state)
 {
 	ok1(*state == 1);
 	(*state)++;
-	io_break(state + 1, NULL);
+	io_break(state + 1, NULL, NULL);
+}
+
+static void init_conn(int fd, int *state)
+{
+	if (!io_new_conn(fd, start_ok, finish_ok, state))
+		abort();
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -63,7 +69,7 @@ int main(void)
 	plan_tests(9);
 	fd = make_listen_fd("65001", &addrinfo);
 	ok1(fd >= 0);
-	l = io_new_listener(fd, start_ok, finish_ok, &state);
+	l = io_new_listener(fd, init_conn, &state);
 	ok1(l);
 	fflush(stdout);
 	if (!fork()) {