Merge Makefile rewrite into master

[ccan] / ccan / io / test / run-12-bidir.c

diff --git a/ccan/io/test/run-12-bidir.c b/ccan/io/test/run-12-bidir.c
index 2ecc5470e7ef5a8d2ec22469bbb119a82833ba60..e79acb56db1ce2d68d605b3419e6aa813c4b938c 100644 (file)
--- a/ccan/io/test/run-12-bidir.c
+++ b/ccan/io/test/run-12-bidir.c
@@ -15,7 +15,6 @@
 struct data {
        struct io_listener *l;
        int state;
-       int done;
        char buf[4];
        char wbuf[32];
 };
@@ -25,15 +24,22 @@ static void finish_ok(struct io_conn *conn, struct data *d)
        d->state++;
 }
 
-static struct io_plan *rw_done(struct io_conn *conn, struct data *d)
+static struct io_plan *r_done(struct io_conn *conn, struct data *d)
 {
        d->state++;
-       d->done++;
-       if (d->done == 2)
+       if (d->state == 3)
                return io_close(conn);
        return io_wait(conn, NULL, io_never, NULL);
 }
 
+static struct io_plan *w_done(struct io_conn *conn, struct data *d)
+{
+       d->state++;
+       if (d->state == 3)
+               return io_close(conn);
+       return io_out_wait(conn, NULL, io_never, NULL);
+}
+
 static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 {
 #ifdef DEBUG_CONN
@@ -48,8 +54,8 @@ static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
        io_set_finish(conn, finish_ok, d);
 
        return io_duplex(conn,
-                        io_read(conn, d->buf, sizeof(d->buf), rw_done, d),
-                        io_write(conn, d->wbuf, sizeof(d->wbuf), rw_done, d));
+                        io_read(conn, d->buf, sizeof(d->buf), r_done, d),
+                        io_write(conn, d->wbuf, sizeof(d->wbuf), w_done, d));
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -91,9 +97,8 @@ int main(void)
        int fd, status;
 
        /* This is how many tests you plan to run */
-       plan_tests(10);
+       plan_tests(9);
        d->state = 0;
-       d->done = 0;
        fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
        d->l = io_new_listener(NULL, fd, init_conn, d);
@@ -127,7 +132,6 @@ int main(void)
        freeaddrinfo(addrinfo);
        ok1(io_loop(NULL, NULL) == NULL);
        ok1(d->state == 4);
-       ok1(d->done == 2);
        ok1(memcmp(d->buf, "hellothere", sizeof(d->buf)) == 0);
        free(d);