ccan/io: io_close_cb()
[ccan] / ccan / io / test / run-10-many.c
index 1c39635b62ff674e6b961402d49af94881696f2b..da59a3cc30ef0f6ebb734a24d755515f636b4971 100644 (file)
@@ -22,7 +22,7 @@ static struct io_plan poke_writer(struct io_conn *conn, struct buffer *buf)
        assert(conn == buf->reader);
 
        if (buf->iters == NUM_ITERS)
-               return io_close(conn, NULL);
+               return io_close();
 
        /* You write. */
        io_wake(buf->writer,
@@ -40,7 +40,7 @@ static struct io_plan poke_reader(struct io_conn *conn, struct buffer *buf)
                io_read(&buf->buf, sizeof(buf->buf), poke_writer, buf));
 
        if (++buf->iters == NUM_ITERS)
-               return io_close(conn, NULL);
+               return io_close();
 
        /* I'll wait until you tell me to write. */
        return io_idle();
@@ -66,14 +66,13 @@ int main(void)
                sprintf(buf[i].buf, "%i-%i", i, i);
 
                /* Wait for writer to tell us to read. */
-               buf[i].reader = io_new_conn(last_read, io_idle(), NULL, &buf[i]);
+               buf[i].reader = io_new_conn(last_read, io_idle());
                if (!buf[i].reader)
                        break;
                buf[i].writer = io_new_conn(fds[1],
                                            io_write(&buf[i].buf,
                                                     sizeof(buf[i].buf),
-                                                    poke_reader, &buf[i]),
-                                           NULL, &buf[i]);
+                                                    poke_reader, &buf[i]));
                if (!buf[i].writer)
                        break;
                last_read = fds[0];
@@ -84,12 +83,11 @@ int main(void)
        /* Last one completes the cirle. */
        i = 0;
        sprintf(buf[i].buf, "%i-%i", i, i);
-       buf[i].reader = io_new_conn(last_read, io_idle(), NULL, NULL);
+       buf[i].reader = io_new_conn(last_read, io_idle());
        ok1(buf[i].reader);
        buf[i].writer = io_new_conn(last_write,
                                    io_write(&buf[i].buf, sizeof(buf[i].buf),
-                                            poke_reader, &buf[i]),
-                                   NULL, NULL);
+                                            poke_reader, &buf[i]));
        ok1(buf[i].writer);
 
        /* They should eventually exit */