ccan/io: generic init function for listening connections.

[ccan] / ccan / io / test / run-03-readpartial.c

diff --git a/ccan/io/test/run-03-readpartial.c b/ccan/io/test/run-03-readpartial.c
index 4898eb80665a608cf45525092db7eb547e2e2095..a7d0ae3161aa674cc7b22a23ec16c1148cb1cca8 100644 (file)
--- a/ccan/io/test/run-03-readpartial.c
+++ b/ccan/io/test/run-03-readpartial.c
@@ -12,19 +12,25 @@ struct data {
        char buf[4];
 };
 
        char buf[4];
 };
 

-static struct io_plan *start_ok(struct io_conn *conn, struct data *d)
+static struct io_plan start_ok(struct io_conn *conn, struct data *d)

 {
        ok1(d->state == 0);
        d->state++;
        d->bytes = sizeof(d->buf);
 {
        ok1(d->state == 0);
        d->state++;
        d->bytes = sizeof(d->buf);

-       return io_read_partial(d->buf, &d->bytes, io_next(conn, io_close, d));
+       return io_read_partial(d->buf, &d->bytes, io_close, d);

 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 1);
        d->state++;
 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 1);
        d->state++;

-       io_break(d, NULL);
+       io_break(d, NULL, NULL);
+}
+
+static void init_conn(int fd, struct data *d)
+{
+       if (!io_new_conn(fd, start_ok, finish_ok, d))
+               abort();

 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)


@@ -89,7 +95,7 @@ int main(void)
        d->state = 0;
        fd = make_listen_fd("65003", &addrinfo);
        ok1(fd >= 0);
        d->state = 0;
        fd = make_listen_fd("65003", &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()) {
        ok1(l);
        fflush(stdout);
        if (!fork()) {