static void del_conn(struct io_conn *conn)
{
- if (conn->fd.finish)
- conn->fd.finish(conn, conn->fd.finish_arg);
+ if (conn->finish)
+ conn->finish(conn, conn->finish_arg);
if (timeout_active(conn))
backend_del_timeout(conn);
free(conn->timeout);
conn->duplex->duplex = NULL;
} else
del_fd(&conn->fd);
- if (conn->state == FINISHED)
+ if (conn->state == IO_FINISHED)
num_finished--;
- else if (conn->state == NEXT)
+ else if (conn->state == IO_NEXT)
num_next--;
}
if (pfd->events)
num_waiting++;
- if (state == NEXT)
+ if (state == IO_NEXT)
num_next++;
- else if (state == FINISHED)
+ else if (state == IO_FINISHED)
num_finished++;
conn->state = state;
/* FIXME: What to do here? */
if (fd < 0)
return;
- c = io_new_conn(fd, l->fd.next, l->fd.finish, l->fd.next_arg);
+ c = io_new_conn(fd, l->next, l->finish, l->conn_arg);
if (!c) {
close(fd);
return;
continue;
c = (void *)fds[i];
for (duplex = c->duplex; c; c = duplex, duplex = NULL) {
- if (c->state == FINISHED) {
+ if (c->state == IO_FINISHED) {
del_conn(c);
free(c);
i--;
- } else if (!finished_only && c->state == NEXT) {
- backend_set_state(c,
- c->fd.next(c,
- c->fd.next_arg));
+ } else if (!finished_only && c->state == IO_NEXT) {
+ backend_set_state(c, c->next(c, c->next_arg));
num_next--;
}
}