io: change io_idle() to io_wait()

[ccan] / ccan / io / test / run-15-timeout.c

diff --git a/ccan/io/test/run-15-timeout.c b/ccan/io/test/run-15-timeout.c
index f8ea6f4c22891c602c339a60401b89830730b5b7..2aceb2b5b26badb86aed5daba74bf9e1f8742f54 100644 (file)
--- 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++;
 {
        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)
 }
 
 static struct io_plan timeout(struct io_conn *conn, struct data *d)


@@ -31,14 +31,14 @@ static struct io_plan timeout(struct io_conn *conn, struct data *d)
        ok1(d->state == 1);
        d->state++;
        d->timed_out = true;
        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)
 {
        ok1(d->state == 2);
        d->state++;
 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 2);
        d->state++;

-       io_break(d, io_idle());
+       io_break(d, io_never());

 }
 
 static void init_conn(int fd, struct data *d)
 }
 
 static void init_conn(int fd, struct data *d)


@@ -48,8 +48,8 @@ static void init_conn(int fd, struct data *d)
        ok1(d->state == 0);
        d->state++;
 
        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);
 }
 
        io_timeout(conn, time_from_usec(d->timeout_usec), timeout, d);
 }