X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-17-homemade-io.c;h=c5d82889021ce6430a47a2cdd81f8a5ae23d2135;hp=08c081ec4238a1870637c39eb964b241d822c8c8;hb=cdf62dce7077a9f9a818edbb67d31d033cbb73c6;hpb=e2ce04eac30ec613c858bd4cd2ca12e1c464edb8

diff --git a/ccan/io/test/run-17-homemade-io.c b/ccan/io/test/run-17-homemade-io.c
index 08c081ec..c5d82889 100644
--- a/ccan/io/test/run-17-homemade-io.c
+++ b/ccan/io/test/run-17-homemade-io.c
@@ -20,33 +20,33 @@ static void finish_ok(struct io_conn *conn, struct packet *pkt)
 {
 	ok1(pkt->state == 3);
 	pkt->state++;
-	io_break(pkt, io_idle());
+	io_break(pkt, io_never());
 }
 
-static bool do_read_packet(int fd, struct io_plan *plan)
+static int do_read_packet(int fd, struct io_plan *plan)
 {
-	struct packet *pkt = plan->u.ptr_len.p;
+	struct packet *pkt = plan->u1.vp;
 	char *dest;
 	ssize_t ret;
 	size_t off, totlen;
 
 	/* Reading len? */
-	if (plan->u.ptr_len.len < sizeof(size_t)) {
+	if (plan->u2.s < sizeof(size_t)) {
 		ok1(pkt->state == 1);
 		pkt->state++;
 		dest = (char *)&pkt->len;
-		off = plan->u.ptr_len.len;
+		off = plan->u2.s;
 		totlen = sizeof(pkt->len);
 	} else {
 		ok1(pkt->state == 2);
 		pkt->state++;
 		if (pkt->len == 0)
-			return true;
+			return io_debug_io(1);
 		if (!pkt->contents && !(pkt->contents = malloc(pkt->len)))
 			goto fail;
 		else {
 			dest = pkt->contents;
-			off = plan->u.ptr_len.len - sizeof(pkt->len);
+			off = plan->u2.s - sizeof(pkt->len);
 			totlen = pkt->len;
 		}
 	}
@@ -55,17 +55,15 @@ static bool do_read_packet(int fd, struct io_plan *plan)
 	if (ret <= 0)
 		goto fail;
 
-	plan->u.ptr_len.len += ret;
+	plan->u2.s += ret;
 
 	/* Finished? */
-	return (plan->u.ptr_len.len >= sizeof(pkt->len)
-		&& plan->u.ptr_len.len == pkt->len + sizeof(pkt->len));
+	return io_debug_io(plan->u2.s >= sizeof(pkt->len)
+			   && plan->u2.s == pkt->len + sizeof(pkt->len));
 
 fail:
 	free(pkt->contents);
-	/* Override next function to close us. */
-	plan->next = io_close;
-	return true;
+	return io_debug_io(-1);
 }
 
 static struct io_plan io_read_packet(struct packet *pkt,
@@ -76,14 +74,13 @@ static struct io_plan io_read_packet(struct packet *pkt,
 
 	assert(cb);
 	pkt->contents = NULL;
-	plan.u.ptr_len.p = pkt;
-	plan.u.ptr_len.len = 0;
+	plan.u1.vp = pkt;
+	plan.u2.s = 0;
 	plan.io = do_read_packet;
 	plan.next = cb;
 	plan.next_arg = arg;
 	plan.pollflag = POLLIN;
 
-	io_plan_debug(&plan);
 	return plan;
 }
 
@@ -92,8 +89,8 @@ static void init_conn(int fd, struct packet *pkt)
 	ok1(pkt->state == 0);
 	pkt->state++;
 
-	if (!io_new_conn(fd, io_read_packet(pkt, io_close, pkt), finish_ok, pkt))
-		abort();
+	io_set_finish(io_new_conn(fd, io_read_packet(pkt, io_close_cb, pkt)),
+		      finish_ok, pkt);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)