X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-12-bidir.c;h=1ab0a218d02a200e7918a079966d7eda941cd4c6;hp=812c863c85059be1c0fd8dfce286b063034b63f1;hb=641b511049e5c03d45ada0c3fd829691b173e5d1;hpb=34776d3e9ad7de78778306a2d09c2c95df06c902

diff --git a/ccan/io/test/run-12-bidir.c b/ccan/io/test/run-12-bidir.c
index 812c863c..1ab0a218 100644
--- a/ccan/io/test/run-12-bidir.c
+++ b/ccan/io/test/run-12-bidir.c
@@ -25,7 +25,7 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 static struct io_plan write_done(struct io_conn *conn, struct data *d)
 {
 	d->state++;
-	return io_close(conn, NULL);
+	return io_close();
 }
 
 static void init_conn(int fd, struct data *d)
@@ -39,10 +39,11 @@ static void init_conn(int fd, struct data *d)
 
 	memset(d->wbuf, 7, sizeof(d->wbuf));
 
-	conn = io_new_conn(fd, io_read(d->buf, sizeof(d->buf), io_close, d),
-			   finish_ok, d);
-	ok1(io_duplex(conn, io_write(d->wbuf, sizeof(d->wbuf), write_done, d),
-		      finish_ok, d));
+	conn = io_new_conn(fd, io_read(d->buf, sizeof(d->buf), io_close_cb, d));
+	io_set_finish(conn, finish_ok, d);
+	conn = io_duplex(conn, io_write(d->wbuf, sizeof(d->wbuf), write_done, d));
+	ok1(conn);
+	io_set_finish(conn, finish_ok, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)