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

diff --git a/ccan/io/test/run-02-read.c b/ccan/io/test/run-02-read.c
index 4e184909..abc66463 100644
--- a/ccan/io/test/run-02-read.c
+++ b/ccan/io/test/run-02-read.c
@@ -11,18 +11,24 @@ struct data {
 	char buf[4];
 };
 
-static struct io_plan *start_ok(struct io_conn *conn, struct data *d)
+static struct io_plan start_ok(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 0);
 	d->state++;
-	return io_read(conn, d->buf, sizeof(d->buf), io_close, d);
+	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(conn, d, NULL, NULL);
+	io_break(d, NULL, NULL);
+}
+
+static void init_conn(int fd, struct data *d)
+{
+	if (!io_new_conn(fd, start_ok, finish_ok, d))
+		abort();
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -69,7 +75,7 @@ int main(void)
 	d->state = 0;
 	fd = make_listen_fd("65002", &addrinfo);
 	ok1(fd >= 0);
-	l = io_new_listener(fd, start_ok, finish_ok, d);
+	l = io_new_listener(fd, init_conn, d);
 	ok1(l);
 	fflush(stdout);
 	if (!fork()) {