From commits-return-10470-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sun Jun 14 21:46:54 2009 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 16831 invoked from network); 14 Jun 2009 21:46:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Jun 2009 21:46:54 -0000 Received: (qmail 41048 invoked by uid 500); 14 Jun 2009 21:47:06 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 40960 invoked by uid 500); 14 Jun 2009 21:47:06 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 40951 invoked by uid 99); 14 Jun 2009 21:47:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Jun 2009 21:47:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Jun 2009 21:47:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0A94C2388876; Sun, 14 Jun 2009 21:46:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r784620 - in /apr/apr-util/branches/1.4.x: ./ buckets/apr_brigade.c include/apr_queue.h include/apr_reslist.h misc/apr_queue.c Date: Sun, 14 Jun 2009 21:46:40 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090614214641.0A94C2388876@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bojan Date: Sun Jun 14 21:46:40 2009 New Revision: 784620 URL: http://svn.apache.org/viewvc?rev=784620&view=rev Log: Backport r784592 from the trunk. Typo fixes contributed by Neil Conway. Modified: apr/apr-util/branches/1.4.x/ (props changed) apr/apr-util/branches/1.4.x/buckets/apr_brigade.c (props changed) apr/apr-util/branches/1.4.x/include/apr_queue.h apr/apr-util/branches/1.4.x/include/apr_reslist.h apr/apr-util/branches/1.4.x/misc/apr_queue.c (props changed) Propchange: apr/apr-util/branches/1.4.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 14 21:46:40 2009 @@ -1,2 +1,2 @@ -/apr/apr/trunk:781403,781409,784519 +/apr/apr/trunk:781403,781409,784519,784592 /apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630 Propchange: apr/apr-util/branches/1.4.x/buckets/apr_brigade.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 14 21:46:40 2009 @@ -1,2 +1,2 @@ -/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519 +/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519,784592 /apr/apr-util/trunk/buckets/apr_brigade.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630 Modified: apr/apr-util/branches/1.4.x/include/apr_queue.h URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/include/apr_queue.h?rev=784620&r1=784619&r2=784620&view=diff ============================================================================== --- apr/apr-util/branches/1.4.x/include/apr_queue.h (original) +++ apr/apr-util/branches/1.4.x/include/apr_queue.h Sun Jun 14 21:46:40 2009 @@ -57,13 +57,13 @@ apr_pool_t *a); /** - * push/add a object to the queue, blocking if the queue is already full + * push/add an object to the queue, blocking if the queue is already full * * @param queue the queue * @param data the data * @returns APR_EINTR the blocking was interrupted (try again) * @returns APR_EOF the queue has been terminated - * @returns APR_SUCCESS on a successfull push + * @returns APR_SUCCESS on a successful push */ APU_DECLARE(apr_status_t) apr_queue_push(apr_queue_t *queue, void *data); @@ -74,31 +74,31 @@ * @param data the data * @returns APR_EINTR the blocking was interrupted (try again) * @returns APR_EOF if the queue has been terminated - * @returns APR_SUCCESS on a successfull pop + * @returns APR_SUCCESS on a successful pop */ APU_DECLARE(apr_status_t) apr_queue_pop(apr_queue_t *queue, void **data); /** - * push/add a object to the queue, returning immediatly if the queue is full + * push/add an object to the queue, returning immediately if the queue is full * * @param queue the queue * @param data the data * @returns APR_EINTR the blocking operation was interrupted (try again) * @returns APR_EAGAIN the queue is full * @returns APR_EOF the queue has been terminated - * @returns APR_SUCCESS on a successfull push + * @returns APR_SUCCESS on a successful push */ APU_DECLARE(apr_status_t) apr_queue_trypush(apr_queue_t *queue, void *data); /** - * pop/get an object to the queue, returning immediatly if the queue is empty + * pop/get an object to the queue, returning immediately if the queue is empty * * @param queue the queue * @param data the data * @returns APR_EINTR the blocking operation was interrupted (try again) * @returns APR_EAGAIN the queue is empty * @returns APR_EOF the queue has been terminated - * @returns APR_SUCCESS on a successfull push + * @returns APR_SUCCESS on a successful push */ APU_DECLARE(apr_status_t) apr_queue_trypop(apr_queue_t *queue, void **data); @@ -120,7 +120,7 @@ APU_DECLARE(apr_status_t) apr_queue_interrupt_all(apr_queue_t *queue); /** - * terminate all queue, sendinging a interupt to all the + * terminate the queue, sending an interrupt to all the * blocking threads * * @param queue the queue Modified: apr/apr-util/branches/1.4.x/include/apr_reslist.h URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/include/apr_reslist.h?rev=784620&r1=784619&r2=784620&view=diff ============================================================================== --- apr/apr-util/branches/1.4.x/include/apr_reslist.h (original) +++ apr/apr-util/branches/1.4.x/include/apr_reslist.h Sun Jun 14 21:46:40 2009 @@ -77,7 +77,7 @@ * @param con Constructor routine that is called to create a new resource. * @param de Destructor routine that is called to destroy an expired resource. * @param params Passed to constructor and deconstructor - * @param pool The pool from which to create this resoure list. Also the + * @param pool The pool from which to create this resource list. Also the * same pool that is passed to the constructor and destructor * routines. * @remark If APR has been compiled without thread support, hmax will be @@ -123,7 +123,7 @@ * Set the timeout the acquire will wait for a free resource * when the maximum number of resources is exceeded. * @param reslist The resource list. - * @param timeout Timeout to wait. The zero waits forewer. + * @param timeout Timeout to wait. The zero waits forever. */ APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist, apr_interval_time_t timeout); Propchange: apr/apr-util/branches/1.4.x/misc/apr_queue.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 14 21:46:40 2009 @@ -1,3 +1,3 @@ -/apr/apr/trunk/misc/apr_queue.c:781403,781409,784519 +/apr/apr/trunk/misc/apr_queue.c:781403,781409,784519,784592 /apr/apr/trunk/util-misc/apr_queue.c:784520 /apr/apr-util/trunk/misc/apr_queue.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630