diff options
| author | Greg Ames <gregames@apache.org> | 2013-01-17 21:54:58 +0000 |
|---|---|---|
| committer | Greg Ames <gregames@apache.org> | 2013-01-17 21:54:58 +0000 |
| commit | e51341421c5cabb9298c3b08cdfd3031749e532b (patch) | |
| tree | 2a65b1d550cfb1ed29dfbc8357e65d22254d2779 /poll | |
| parent | 898cde77465e915ba1e259211df1ffd622e64653 (diff) | |
| download | apr-e51341421c5cabb9298c3b08cdfd3031749e532b.tar.gz | |
rename state to ASIO_REMOVED to match the name of the apr_pollset_remove API that set it
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1434929 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll')
| -rw-r--r-- | poll/unix/z_asio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/poll/unix/z_asio.c b/poll/unix/z_asio.c index 4b78623a9..fa236f95c 100644 --- a/poll/unix/z_asio.c +++ b/poll/unix/z_asio.c @@ -77,7 +77,7 @@ struct apr_pollset_private_t typedef enum { ASIO_INIT = 0, - ASIO_CANCELLED + ASIO_REMOVED } asio_state_e; typedef struct asio_elem_t asio_elem_t; @@ -510,7 +510,7 @@ static apr_status_t asio_pollset_remove(apr_pollset_t *pollset, DBG1(4, "asyncio returned %d\n", rv); if (rv == 1) { - elem->state = ASIO_CANCELLED; + elem->state = ASIO_REMOVED; rv = APR_SUCCESS; } } @@ -567,7 +567,7 @@ static process_msg(apr_pollset_t *pollset, struct asio_msgbuf_t *msg) DBG_BUFF asio_elem_t *elem = msg->msg_elem; - if (elem->state == ASIO_CANCELLED) { + if (elem->state == ASIO_REMOVED) { DBG2(5, "for cancelled elem, recycling memory - elem %08p, fd %d\n", elem, elem->os_pfd.fd); APR_RING_INSERT_TAIL(&(pollset->p->free_ring), elem, @@ -619,7 +619,7 @@ static apr_status_t asio_pollset_poll(apr_pollset_t *pollset, * result set last time. re-poll inline for both cases */ - if (elem->state == ASIO_CANCELLED) { + if (elem->state == ASIO_REMOVED) { continue; /* do not re-add if it has been _removed */ } |