X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-04-writepartial.c;h=4ca21a32a25d141c42c82959efea06994e3430f3;hb=6109a0a6140acbbfe5e998f7d7ea1215f035cb90;hp=8cfb2abeb16bb126c8db502ede3358fcf46d8ba2;hpb=13b38a7282c6043d6abe310e5a16d6610ed7a1c1;p=ccan diff --git a/ccan/io/test/run-04-writepartial.c b/ccan/io/test/run-04-writepartial.c index 8cfb2abe..4ca21a32 100644 --- a/ccan/io/test/run-04-writepartial.c +++ b/ccan/io/test/run-04-writepartial.c @@ -20,16 +20,17 @@ static void finish_ok(struct io_conn *conn, struct data *d) { ok1(d->state == 1); d->state++; - io_break(d, io_idle()); + 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++; - io_set_finish(io_new_conn(fd, - io_write_partial(d->buf, &d->bytes, io_close_cb, d)), - finish_ok, d); + io_set_finish(conn, finish_ok, d); + + return io_write_partial(conn, d->buf, d->bytes, &d->bytes, + io_close_cb, d); } static int make_listen_fd(const char *port, struct addrinfo **info) @@ -97,7 +98,7 @@ int main(void) memset(d->buf, 'a', d->bytes); 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()) {