]> granicus.if.org Git - apache/commitdiff
naming suggestion re: trawick
authorJim Jagielski <jim@apache.org>
Mon, 25 Nov 2013 21:10:05 +0000 (21:10 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 25 Nov 2013 21:10:05 +0000 (21:10 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545408 13f79535-47bb-0310-9956-ffa450edef68

server/mpm/event/fdqueue.c
server/mpm/eventopt/fdqueue.c

index 2ffa8880491c27b2da103dc7af7143aa31159eae..29fc5c9cdbc066743eb4b0a5bbcefc9d49c90791 100644 (file)
@@ -127,9 +127,9 @@ apr_status_t ap_queue_info_set_idle(fd_queue_info_t * queue_info,
 
 apr_status_t ap_queue_info_try_get_idler(fd_queue_info_t * queue_info)
 {
-    int prev_idlers;
-    prev_idlers = apr_atomic_add32((apr_uint32_t *)&(queue_info->idlers), -1) - zero_pt;
-    if (prev_idlers <= 0) {
+    int new_idlers;
+    new_idlers = apr_atomic_add32((apr_uint32_t *)&(queue_info->idlers), -1) - zero_pt;
+    if (--new_idlers <= 0) {
         apr_atomic_inc32((apr_uint32_t *)&(queue_info->idlers));    /* back out dec */
         return APR_EAGAIN;
     }
index d372dcd9cf1f17f2d0169769a0780caca6ae696c..90a2676af3629b7c43245d1ee859c956040a156a 100644 (file)
@@ -127,9 +127,9 @@ apr_status_t ap_queue_info_set_idle(fd_queue_info_t * queue_info,
 
 apr_status_t ap_queue_info_try_get_idler(fd_queue_info_t * queue_info)
 {
-    int prev_idlers;
-    prev_idlers = apr_atomic_add32((apr_uint32_t *)&(queue_info->idlers), -1) - zero_pt;
-    if (prev_idlers <= 0) {
+    int new_idlers;
+    new_idlers = apr_atomic_add32((apr_uint32_t *)&(queue_info->idlers), -1) - zero_pt;
+    if (--new_idlers <= 0) {
         apr_atomic_inc32((apr_uint32_t *)&(queue_info->idlers));    /* back out dec */
         return APR_EAGAIN;
     }