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/10/25 05:15:52 UTC
svn commit: r829492 - in /apr/apr/branches/1.3.x: ./ include/apr_hash.h
test/NWGNUaprtest test/NWGNUglobalmutexchild test/NWGNUmod_test
test/NWGNUproc_child test/NWGNUreadchild test/NWGNUsockchild
test/NWGNUtestatmc test/NWGNUtryread
Author: bojan
Date: Sun Oct 25 04:15:51 2009
New Revision: 829492
URL: http://svn.apache.org/viewvc?rev=829492&view=rev
Log:
Backport r829490 from the trunk.
Fix apr_hash_first() doxygen syntax.
Modified:
apr/apr/branches/1.3.x/ (props changed)
apr/apr/branches/1.3.x/include/apr_hash.h
apr/apr/branches/1.3.x/test/NWGNUaprtest (props changed)
apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild (props changed)
apr/apr/branches/1.3.x/test/NWGNUmod_test (props changed)
apr/apr/branches/1.3.x/test/NWGNUproc_child (props changed)
apr/apr/branches/1.3.x/test/NWGNUreadchild (props changed)
apr/apr/branches/1.3.x/test/NWGNUsockchild (props changed)
apr/apr/branches/1.3.x/test/NWGNUtestatmc (props changed)
apr/apr/branches/1.3.x/test/NWGNUtryread (props changed)
Propchange: apr/apr/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 25 04:15:51 2009
@@ -1,2 +1,2 @@
/apr/apr/branches/1.4.x:783970
-/apr/apr/trunk:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588,794485,795267,799497,800627,809854
+/apr/apr/trunk:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588,794485,795267,799497,800627,809854,829490
Modified: apr/apr/branches/1.3.x/include/apr_hash.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/include/apr_hash.h?rev=829492&r1=829491&r2=829492&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/include/apr_hash.h (original)
+++ apr/apr/branches/1.3.x/include/apr_hash.h Sun Oct 25 04:15:51 2009
@@ -122,16 +122,15 @@
* @param p The pool to allocate the apr_hash_index_t iterator. If this
* pool is NULL, then an internal, non-thread-safe iterator is used.
* @param ht The hash table
+ * @return The iteration state
* @remark There is no restriction on adding or deleting hash entries during
* an iteration (although the results may be unpredictable unless all you do
* is delete the current entry) and multiple iterations can be in
* progress at the same time.
- */
-/**
- * @example
*
- * <PRE>
- *
+ * @par Example:
+ *
+ * @code
* int sum_values(apr_pool_t *p, apr_hash_t *ht)
* {
* apr_hash_index_t *hi;
@@ -143,7 +142,7 @@
* }
* return sum;
* }
- * </PRE>
+ * @endcode
*/
APR_DECLARE(apr_hash_index_t *) apr_hash_first(apr_pool_t *p, apr_hash_t *ht);
Propchange: apr/apr/branches/1.3.x/test/NWGNUaprtest
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 25 04:15:51 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnuaprtest:783970
-/apr/apr/trunk/test/NWGNUaprtest:794485,795267,799497,800627,809854
+/apr/apr/trunk/test/NWGNUaprtest:794485,795267,799497,800627,809854,829490
/apr/apr/trunk/test/nwgnuaprtest:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 25 04:15:51 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnuglobalmutexchild:783970
-/apr/apr/trunk/test/NWGNUglobalmutexchild:794485,795267,799497,800627,809854
+/apr/apr/trunk/test/NWGNUglobalmutexchild:794485,795267,799497,800627,809854,829490
/apr/apr/trunk/test/nwgnuglobalmutexchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUmod_test
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 25 04:15:51 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnumod_test:783970
-/apr/apr/trunk/test/NWGNUmod_test:794485,795267,799497,800627,809854
+/apr/apr/trunk/test/NWGNUmod_test:794485,795267,799497,800627,809854,829490
/apr/apr/trunk/test/nwgnumod_test:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUproc_child
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 25 04:15:51 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnuproc_child:783970
-/apr/apr/trunk/test/NWGNUproc_child:794485,795267,799497,800627,809854
+/apr/apr/trunk/test/NWGNUproc_child:794485,795267,799497,800627,809854,829490
/apr/apr/trunk/test/nwgnuproc_child:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUreadchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 25 04:15:51 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnureadchild:783970
-/apr/apr/trunk/test/NWGNUreadchild:794485,795267,799497,800627,809854
+/apr/apr/trunk/test/NWGNUreadchild:794485,795267,799497,800627,809854,829490
/apr/apr/trunk/test/nwgnureadchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUsockchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 25 04:15:51 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnusockchild:783970
-/apr/apr/trunk/test/NWGNUsockchild:794485,795267,799497,800627,809854
+/apr/apr/trunk/test/NWGNUsockchild:794485,795267,799497,800627,809854,829490
/apr/apr/trunk/test/nwgnusockchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUtestatmc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 25 04:15:51 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnutestatmc:783970
-/apr/apr/trunk/test/NWGNUtestatmc:794485,795267,799497,800627,809854
+/apr/apr/trunk/test/NWGNUtestatmc:794485,795267,799497,800627,809854,829490
/apr/apr/trunk/test/nwgnutestatmc:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUtryread
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 25 04:15:51 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnutryread:783970
-/apr/apr/trunk/test/NWGNUtryread:794485,795267,799497,800627,809854
+/apr/apr/trunk/test/NWGNUtryread:794485,795267,799497,800627,809854,829490
/apr/apr/trunk/test/nwgnutryread:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588