]> granicus.if.org Git - apache/commitdiff
Minor cleanups:
authorJoe Orton <jorton@apache.org>
Thu, 10 Jul 2003 20:29:25 +0000 (20:29 +0000)
committerJoe Orton <jorton@apache.org>
Thu, 10 Jul 2003 20:29:25 +0000 (20:29 +0000)
* fdqueue.c (ap_queue_info_term, ap_queue_interrupt_all):
Remove redundant conditionals.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100542 13f79535-47bb-0310-9956-ffa450edef68

server/mpm/worker/fdqueue.c

index 83441e5814a5b0e955bc86b8f20d22852aa557f5..d8a308e8db5818f85c1a8d6f425772d8bc88c935 100644 (file)
@@ -252,11 +252,7 @@ apr_status_t ap_queue_info_term(fd_queue_info_t *queue_info)
     }
     queue_info->terminated = 1;
     apr_thread_cond_broadcast(queue_info->wait_for_idler);
-    rv = apr_thread_mutex_unlock(queue_info->idlers_mutex);
-    if (rv != APR_SUCCESS) {
-        return rv;
-    }
-    return APR_SUCCESS;
+    return apr_thread_mutex_unlock(queue_info->idlers_mutex);
 }
 
 /**
@@ -403,10 +399,7 @@ apr_status_t ap_queue_interrupt_all(fd_queue_t *queue)
         return rv;
     }
     apr_thread_cond_broadcast(queue->not_empty);
-    if ((rv = apr_thread_mutex_unlock(queue->one_big_mutex)) != APR_SUCCESS) {
-        return rv;
-    }
-    return APR_SUCCESS;
+    return apr_thread_mutex_unlock(queue->one_big_mutex);
 }
 
 apr_status_t ap_queue_term(fd_queue_t *queue)