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

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