X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-04-writepartial.c;h=12a21ddcd712e08fc793150380f8a8e0fefc17a4;hp=d4e33c9674ecf625edfedd42d703302bc14d85b9;hb=57d9d1be33905691ec756b14b066181ca6850ced;hpb=625bae8f5720d3ad3253ea9b26ad68abcd81bde5 diff --git a/ccan/io/test/run-04-writepartial.c b/ccan/io/test/run-04-writepartial.c index d4e33c96..12a21ddc 100644 --- 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(conn, 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(conn, 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()) {