You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2009/06/14 23:48:03 UTC
svn commit: r784622 - in /apr/apr-util/branches/1.3.x: ./
buckets/apr_brigade.c dbd/apr_dbd_pgsql.c include/apr_queue.h
include/apr_reslist.h misc/apr_queue.c
Author: bojan
Date: Sun Jun 14 21:48:03 2009
New Revision: 784622
URL: http://svn.apache.org/viewvc?rev=784622&view=rev
Log:
Backport r784592 from the trunk.
Typo fixes contributed by Neil Conway.
Modified:
apr/apr-util/branches/1.3.x/ (props changed)
apr/apr-util/branches/1.3.x/buckets/apr_brigade.c (props changed)
apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c (props changed)
apr/apr-util/branches/1.3.x/include/apr_queue.h
apr/apr-util/branches/1.3.x/include/apr_reslist.h
apr/apr-util/branches/1.3.x/misc/apr_queue.c (props changed)
Propchange: apr/apr-util/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 14 21:48:03 2009
@@ -1,3 +1,3 @@
-/apr/apr/trunk:781403
+/apr/apr/trunk:781403,784592
/apr/apr-util/branches/1.3.x:692751
/apr/apr-util/trunk:692751,731225,743986,744009,745771,747612,747623,747630,781403
Propchange: apr/apr-util/branches/1.3.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 14 21:48:03 2009
@@ -1,3 +1,3 @@
-/apr/apr/trunk/buckets/apr_brigade.c:768417,781403
+/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,784592
/apr/apr-util/branches/1.3.x/buckets/apr_brigade.c:692751
/apr/apr-util/trunk/buckets/apr_brigade.c:692751,731225,743986,744009,745771,747612,747623,747630,781403
Propchange: apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 14 21:48:03 2009
@@ -1,3 +1,3 @@
-/apr/apr/trunk/dbd/apr_dbd_pgsql.c:781403
+/apr/apr/trunk/dbd/apr_dbd_pgsql.c:781403,784592
/apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c:692751
/apr/apr-util/trunk/dbd/apr_dbd_pgsql.c:692751,704986,731225,743986,744009,745771,747612,747623,747630,781403
Modified: apr/apr-util/branches/1.3.x/include/apr_queue.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/include/apr_queue.h?rev=784622&r1=784621&r2=784622&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/include/apr_queue.h (original)
+++ apr/apr-util/branches/1.3.x/include/apr_queue.h Sun Jun 14 21:48:03 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.3.x/include/apr_reslist.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/include/apr_reslist.h?rev=784622&r1=784621&r2=784622&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/include/apr_reslist.h (original)
+++ apr/apr-util/branches/1.3.x/include/apr_reslist.h Sun Jun 14 21:48:03 2009
@@ -78,7 +78,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.
* @warning If you're creating a sub-pool of the pool passed into this
@@ -130,7 +130,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.3.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 14 21:48:03 2009
@@ -1,4 +1,4 @@
-/apr/apr/trunk/misc/apr_queue.c:781403
+/apr/apr/trunk/misc/apr_queue.c:781403,784592
/apr/apr/trunk/util-misc/apr_queue.c:784520
/apr/apr-util/branches/1.3.x/misc/apr_queue.c:692751
/apr/apr-util/trunk/misc/apr_queue.c:692751,731225,743986,744009,745771,747612,747623,747630,781403