X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-03-readpartial.c;h=7b3606385f8d0255635bc1128b5739deb880ec97;hp=860792b7784bb3762f8204a6d9955b155477fb8c;hb=cdffdf5d61f8330cfc3467e73a84876eb3928e9b;hpb=12e924346b342c61219a3fdc57eb6b00a27f1cd1 diff --git a/ccan/io/test/run-03-readpartial.c b/ccan/io/test/run-03-readpartial.c index 860792b7..7b360638 100644 --- a/ccan/io/test/run-03-readpartial.c +++ b/ccan/io/test/run-03-readpartial.c @@ -20,18 +20,18 @@ static void finish_ok(struct io_conn *conn, struct data *d) { ok1(d->state == 1); d->state++; - io_break(d, io_never()); + io_break(d); } -static void init_conn(int fd, struct data *d) +static struct io_plan *init_conn(struct io_conn *conn, struct data *d) { ok1(d->state == 0); d->state++; - d->bytes = sizeof(d->buf); - io_set_finish(io_new_conn(fd, - io_read_partial(d->buf, &d->bytes, io_close_cb, d)), - finish_ok, d); + io_set_finish(conn, finish_ok, d); + + return io_read_partial(conn, d->buf, sizeof(d->buf), &d->bytes, + io_close_cb, d); } static int make_listen_fd(const char *port, struct addrinfo **info) @@ -96,7 +96,7 @@ int main(void) d->state = 0; fd = make_listen_fd(PORT, &addrinfo); ok1(fd >= 0); - l = io_new_listener(fd, init_conn, d); + l = io_new_listener(NULL, fd, init_conn, d); ok1(l); fflush(stdout); if (!fork()) {