ccan/io: remove conn arg from io_plan constructors.

[ccan] / ccan / io / test / run-10-many.c

diff --git a/ccan/io/test/run-10-many.c b/ccan/io/test/run-10-many.c
index 313691187f6c63d059f03f0144e5a1fa6f2c48be..95a716e2263d26bc65e91d82f818d6a29c276509 100644 (file)
--- a/ccan/io/test/run-10-many.c
+++ b/ccan/io/test/run-10-many.c
@@ -15,26 +15,24 @@ struct buffer {
        char buf[32];
 };
 
-static struct io_plan *poke_writer(struct io_conn *conn, struct buffer *buf);
-static struct io_plan *poke_reader(struct io_conn *conn, struct buffer *buf);
+static struct io_plan poke_writer(struct io_conn *conn, struct buffer *buf);
+static struct io_plan poke_reader(struct io_conn *conn, struct buffer *buf);
 
-static struct io_plan *plan_read(struct io_conn *conn, struct buffer *buf)
+static struct io_plan plan_read(struct io_conn *conn, struct buffer *buf)
 {
        assert(conn == buf->reader);
 
-       return io_read(conn, &buf->buf, sizeof(buf->buf),
-                      poke_writer, buf);
+       return io_read(&buf->buf, sizeof(buf->buf), poke_writer, buf);
 }
 
-static struct io_plan *plan_write(struct io_conn *conn, struct buffer *buf)
+static struct io_plan plan_write(struct io_conn *conn, struct buffer *buf)
 {
        assert(conn == buf->writer);
 
-       return io_write(conn, &buf->buf, sizeof(buf->buf),
-                       poke_reader, buf);
+       return io_write(&buf->buf, sizeof(buf->buf), poke_reader, buf);
 }
 
-static struct io_plan *poke_writer(struct io_conn *conn, struct buffer *buf)
+static struct io_plan poke_writer(struct io_conn *conn, struct buffer *buf)
 {
        assert(conn == buf->reader);
 
@@ -45,10 +43,10 @@ static struct io_plan *poke_writer(struct io_conn *conn, struct buffer *buf)
        io_wake(buf->writer, plan_write, buf);
 
        /* I'll wait until you wake me. */
-       return io_idle(conn);
+       return io_idle();
 }
 
-static struct io_plan *poke_reader(struct io_conn *conn, struct buffer *buf)
+static struct io_plan poke_reader(struct io_conn *conn, struct buffer *buf)
 {
        assert(conn == buf->writer);
        /* You read. */
@@ -58,15 +56,15 @@ static struct io_plan *poke_reader(struct io_conn *conn, struct buffer *buf)
                return io_close(conn, NULL);
 
        /* I'll wait until you tell me to write. */
-       return io_idle(conn);
+       return io_idle();
 }
 
-static struct io_plan *reader(struct io_conn *conn, struct buffer *buf)
+static struct io_plan reader(struct io_conn *conn, struct buffer *buf)
 {
        assert(conn == buf->reader);
 
        /* Wait for writer to tell us to read. */
-       return io_idle(conn);
+       return io_idle();
 }
 
 static struct buffer buf[NUM];