ccan/io: generic init function for listening connections.

[ccan] / ccan / io / test / run-06-idle.c

diff --git a/ccan/io/test/run-06-idle.c b/ccan/io/test/run-06-idle.c
index 597060c2b596f80b5a3b5a43e3539f3371a7fa01..314293a5f0f2b5d6a145c8b38359056bf4a6bc0a 100644 (file)
--- a/ccan/io/test/run-06-idle.c
+++ b/ccan/io/test/run-06-idle.c
@@ -16,14 +16,14 @@ struct data {
        char buf[4];
 };
 
-static struct io_plan *plan_read(struct io_conn *conn, struct data *d)
+static struct io_plan plan_read(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 2 || d->state == 3);
        d->state++;
-       return io_read(conn, d->buf, sizeof(d->buf), io_close, d);
+       return io_read(d->buf, sizeof(d->buf), io_close, d);
 }
 
-static struct io_plan *start_waker(struct io_conn *conn, struct data *d)
+static struct io_plan start_waker(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 1);
        d->state++;
@@ -38,7 +38,7 @@ static void finish_waker(struct io_conn *conn, struct data *d)
        d->state++;
 }
 
-static struct io_plan *start_idle(struct io_conn *conn, struct data *d)
+static struct io_plan start_idle(struct io_conn *conn, struct data *d)
 {
        int fd;
 
@@ -51,14 +51,20 @@ static struct io_plan *start_idle(struct io_conn *conn, struct data *d)
        ok1(fd >= 0);
        ok1(io_new_conn(fd, start_waker, finish_waker, d));
 
-       return io_idle(conn);
+       return io_idle();
 }
 
 static void finish_idle(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 4);
        d->state++;
-       io_break(conn, d, NULL, NULL);
+       io_break(d, NULL, NULL);
+}
+
+static void init_conn(int fd, struct data *d)
+{
+       if (!io_new_conn(fd, start_idle, finish_idle, d))
+               abort();
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -105,7 +111,7 @@ int main(void)
        d->state = 0;
        fd = make_listen_fd("65006", &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, start_idle, finish_idle, d);
+       l = io_new_listener(fd, init_conn, d);
        ok1(l);
        fflush(stdout);
        if (!fork()) {