X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-15-timeout.c;h=6f92ec3a634848c0770fcd21016e56acfb082274;hp=f8ea6f4c22891c602c339a60401b89830730b5b7;hb=b85c47bb81a9078afc5ddc51448560187348bbbf;hpb=34776d3e9ad7de78778306a2d09c2c95df06c902

diff --git a/ccan/io/test/run-15-timeout.c b/ccan/io/test/run-15-timeout.c
index f8ea6f4c..6f92ec3a 100644
--- a/ccan/io/test/run-15-timeout.c
+++ b/ccan/io/test/run-15-timeout.c
@@ -23,7 +23,7 @@ static struct io_plan no_timeout(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 1);
 	d->state++;
-	return io_close(conn, d);
+	return io_close();
 }
 
 static struct io_plan timeout(struct io_conn *conn, struct data *d)
@@ -31,7 +31,7 @@ static struct io_plan timeout(struct io_conn *conn, struct data *d)
 	ok1(d->state == 1);
 	d->state++;
 	d->timed_out = true;
-	return io_close(conn, d);
+	return io_close();
 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
@@ -48,8 +48,8 @@ static void init_conn(int fd, struct data *d)
 	ok1(d->state == 0);
 	d->state++;
 
-	conn = io_new_conn(fd, io_read(d->buf, sizeof(d->buf), no_timeout, d),
-			   finish_ok, d);
+	conn = io_new_conn(fd, io_read(d->buf, sizeof(d->buf), no_timeout, d));
+	io_set_finish(conn, finish_ok, d);
 	io_timeout(conn, time_from_usec(d->timeout_usec), timeout, d);
 }