apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject svn commit: r1434929 - /apr/apr/trunk/poll/unix/z_asio.c
Date Thu, 17 Jan 2013 21:54:58 GMT
Author: gregames
Date: Thu Jan 17 21:54:58 2013
New Revision: 1434929

URL: http://svn.apache.org/viewvc?rev=1434929&view=rev
Log:
rename state to ASIO_REMOVED to match the name of the apr_pollset_remove API that set it

Modified:
    apr/apr/trunk/poll/unix/z_asio.c

Modified: apr/apr/trunk/poll/unix/z_asio.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/z_asio.c?rev=1434929&r1=1434928&r2=1434929&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/z_asio.c (original)
+++ apr/apr/trunk/poll/unix/z_asio.c Thu Jan 17 21:54:58 2013
@@ -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(
         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 *pollse
     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(ap
          * 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 */
         }
 



Mime
View raw message