ccan/io: remove io_state.

[ccan] / ccan / io / test / run-04-writepartial.c

diff --git a/ccan/io/test/run-04-writepartial.c b/ccan/io/test/run-04-writepartial.c
index 5a5b2506e31525f2fd05b4d8ee05c26db6dbad6c..12a21ddcd712e08fc793150380f8a8e0fefc17a4 100644 (file)
--- a/ccan/io/test/run-04-writepartial.c
+++ b/ccan/io/test/run-04-writepartial.c
@@ -12,18 +12,20 @@ struct data {
        char *buf;
 };
 
-static struct io_plan start_ok(struct io_conn *conn, struct data *d)
+static void finish_ok(struct io_conn *conn, struct data *d)
 {
-       ok1(d->state == 0);
+       ok1(d->state == 1);
        d->state++;
-       return io_write_partial(d->buf, &d->bytes, io_close, d);
+       io_break(d, io_idle());
 }
 
-static void finish_ok(struct io_conn *conn, struct data *d)
+static void init_conn(int fd, struct data *d)
 {
-       ok1(d->state == 1);
+       ok1(d->state == 0);
        d->state++;
-       io_break(d, NULL, NULL);
+       if (!io_new_conn(fd, io_write_partial(d->buf, &d->bytes, io_close, d),
+                        finish_ok, d))
+               abort();
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -91,7 +93,7 @@ int main(void)
        memset(d->buf, 'a', d->bytes);
        fd = make_listen_fd("65004", &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, start_ok, finish_ok, d);
+       l = io_new_listener(fd, init_conn, d);
        ok1(l);
        fflush(stdout);
        if (!fork()) {