Merge branch 'master' of ozlabs.org:ccan

[ccan] / ccan / io / test / run-08-read-after-hangup.c

diff --git a/ccan/io/test/run-08-read-after-hangup.c b/ccan/io/test/run-08-read-after-hangup.c
index 95eb651cd7e7f78ee894b8ce35ff664a0320301a..b73139e4f4c7a256c1e00301dce63c67622c1869 100644 (file)
--- a/ccan/io/test/run-08-read-after-hangup.c
+++ b/ccan/io/test/run-08-read-after-hangup.c
@@ -11,8 +11,8 @@ static char inbuf[8];
 
 static struct io_plan wake_it(struct io_conn *conn, struct io_conn *reader)
 {
-       io_wake(reader, io_read(inbuf, 8, io_close, NULL));
-       return io_close(conn, NULL);
+       io_wake(reader, io_read(inbuf, 8, io_close_cb, NULL));
+       return io_close();
 }
 
 int main(void)
@@ -23,9 +23,8 @@ int main(void)
        plan_tests(3);
 
        ok1(pipe(fds) == 0);
-       conn = io_new_conn(fds[0], io_idle(), NULL, NULL);
-       io_new_conn(fds[1], io_write("EASYTEST", 8, wake_it, conn),
-                   NULL, NULL);
+       conn = io_new_conn(fds[0], io_idle());
+       io_new_conn(fds[1], io_write("EASYTEST", 8, wake_it, conn));
 
        ok1(io_loop() == NULL);
        ok1(memcmp(inbuf, "EASYTEST", sizeof(inbuf)) == 0);