X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-10-many.c;h=95a716e2263d26bc65e91d82f818d6a29c276509;hp=6a972ba82da10ef8900c6f3f8bc3ea17b49a7061;hb=737705f0c2ec60ea5b51ca55299488d86db37b5d;hpb=0a2fd289c7bf57d9fc35ad6af36df4bcc694f361

diff --git a/ccan/io/test/run-10-many.c b/ccan/io/test/run-10-many.c
index 6a972ba8..95a716e2 100644
--- 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_op *poke_writer(struct io_conn *conn, struct buffer *buf);
-static struct io_op *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_op *do_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(&buf->buf, sizeof(buf->buf),
-		       io_next(conn, poke_writer, buf));
+	return io_read(&buf->buf, sizeof(buf->buf), poke_writer, buf);
 }
 
-static struct io_op *do_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(&buf->buf, sizeof(buf->buf),
-			io_next(conn, poke_reader, buf));
+	return io_write(&buf->buf, sizeof(buf->buf), poke_reader, buf);
 }
 
-static struct io_op *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);
 
@@ -42,31 +40,31 @@ static struct io_op *poke_writer(struct io_conn *conn, struct buffer *buf)
 		return io_close(conn, NULL);
 
 	/* You write. */
-	io_wake(buf->writer, do_write, 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_op *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. */
-	io_wake(buf->reader, do_read, buf);
+	io_wake(buf->reader, plan_read, buf);
 
 	if (++buf->iters == NUM_ITERS)
 		return io_close(conn, NULL);
 
 	/* I'll wait until you tell me to write. */
-	return io_idle(conn);
+	return io_idle();
 }
 
-static struct io_op *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];
@@ -91,7 +89,7 @@ int main(void)
 		buf[i].reader = io_new_conn(last_read, reader, NULL, &buf[i]);
 		if (!buf[i].reader)
 			break;
-		buf[i].writer = io_new_conn(fds[1], do_write, NULL, &buf[i]);
+		buf[i].writer = io_new_conn(fds[1], plan_write, NULL, &buf[i]);
 		if (!buf[i].writer)
 			break;
 		last_read = fds[0];
@@ -104,7 +102,7 @@ int main(void)
 	sprintf(buf[i].buf, "%i-%i", i, i);
 	buf[i].reader = io_new_conn(last_read, reader, NULL, &buf[i]);
 	ok1(buf[i].reader);
-	buf[i].writer = io_new_conn(last_write, do_write, NULL, &buf[i]);
+	buf[i].writer = io_new_conn(last_write, plan_write, NULL, &buf[i]);
 	ok1(buf[i].writer);
 
 	/* They should eventually exit */