X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-07-break.c;h=19cc6a8e662b393f8f672e3a46d1340d37e2a634;hp=e8db388904638da90f913f9823bae60220337caa;hb=e40f5c50a7a930fc98974936b7366b498ebf984c;hpb=737705f0c2ec60ea5b51ca55299488d86db37b5d;ds=sidebyside

diff --git a/ccan/io/test/run-07-break.c b/ccan/io/test/run-07-break.c
index e8db3889..19cc6a8e 100644
--- a/ccan/io/test/run-07-break.c
+++ b/ccan/io/test/run-07-break.c
@@ -6,23 +6,20 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65007"
+#endif
+
 struct data {
 	int state;
 	char buf[4];
 };
 
-static struct io_plan plan_read(struct io_conn *conn, struct data *d)
+static struct io_plan read_done(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 1);
 	d->state++;
-	return io_read(d->buf, sizeof(d->buf), io_close, d);
-}
-
-static struct io_plan start_break(struct io_conn *conn, struct data *d)
-{
-	ok1(d->state == 0);
-	d->state++;
-	return io_break(d, plan_read, d);
+	return io_close();
 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
@@ -33,8 +30,13 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 
 static void init_conn(int fd, struct data *d)
 {
-	if (!io_new_conn(fd, start_break, finish_ok, d))
-		abort();
+	ok1(d->state == 0);
+	d->state++;
+
+	io_set_finish(io_new_conn(fd,
+				  io_break(d,
+					   io_read(d->buf, sizeof(d->buf), read_done, d))),
+		      finish_ok, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -79,7 +81,7 @@ int main(void)
 	/* This is how many tests you plan to run */
 	plan_tests(13);
 	d->state = 0;
-	fd = make_listen_fd("65007", &addrinfo);
+	fd = make_listen_fd(PORT, &addrinfo);
 	ok1(fd >= 0);
 	l = io_new_listener(fd, init_conn, d);
 	ok1(l);