Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 91042 invoked by uid 500); 11 Jul 2003 12:20:43 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Delivered-To: moderator for cvs@httpd.apache.org Received: (qmail 45218 invoked by uid 500); 10 Jul 2003 20:29:26 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 10 Jul 2003 20:29:25 -0000 Message-ID: <20030710202925.24463.qmail@icarus.apache.org> From: jorton@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/server/mpm/worker fdqueue.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N jorton 2003/07/10 13:29:25 Modified: server/mpm/worker fdqueue.c Log: Minor cleanups: * fdqueue.c (ap_queue_info_term, ap_queue_interrupt_all): Remove redundant conditionals. Revision Changes Path 1.27 +2 -9 httpd-2.0/server/mpm/worker/fdqueue.c Index: fdqueue.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/worker/fdqueue.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -u -r1.26 -r1.27 --- fdqueue.c 3 Feb 2003 17:53:26 -0000 1.26 +++ fdqueue.c 10 Jul 2003 20:29:25 -0000 1.27 @@ -252,11 +252,7 @@ } 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 @@ 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)