You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by sf...@apache.org on 2011/10/15 23:00:43 UTC
svn commit: r1183704 - in /apr/apr/branches/1.4.x: ./ include/apr_general.h
Author: sf
Date: Sat Oct 15 21:00:43 2011
New Revision: 1183704
URL: http://svn.apache.org/viewvc?rev=1183704&view=rev
Log:
Backport r1183683:
Clarify that it is save to call apr_initialize several times.
Modified:
apr/apr/branches/1.4.x/ (props changed)
apr/apr/branches/1.4.x/include/apr_general.h
Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 15 21:00:43 2011
@@ -1,2 +1,2 @@
/apr/apr/branches/1.5.x:1083592
-/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748902,748988,749810,760443,782838,783398,783958,784633,784773,788588,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,835607,905040,908427,910419,917837-917838,983618,990435,1072165,1078845
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748902,748988,749810,760443,782838,783398,783958,784633,784773,788588,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,835607,905040,908427,910419,917837-917838,983618,990435,1072165,1078845,1183683
Modified: apr/apr/branches/1.4.x/include/apr_general.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr_general.h?rev=1183704&r1=1183703&r2=1183704&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr_general.h (original)
+++ apr/apr/branches/1.4.x/include/apr_general.h Sat Oct 15 21:00:43 2011
@@ -169,7 +169,8 @@ void *memchr(const void *s, int c, size_
/**
* Setup any APR internal data structures. This MUST be the first function
- * called for any APR library.
+ * called for any APR library. It is save to call apr_initialize several
+ * times as long as apr_terminate is called the same number of times.
* @remark See apr_app_initialize if this is an application, rather than
* a library consumer of apr.
*/
@@ -193,7 +194,8 @@ APR_DECLARE(apr_status_t) apr_app_initia
/**
* Tear down any APR internal data structures which aren't torn down
- * automatically.
+ * automatically. apr_terminate must be called once for every call to
+ * apr_initialize() or apr_app_initialize().
* @remark An APR program must call this function at termination once it
* has stopped using APR services. The APR developers suggest using
* atexit to ensure this is called. When using APR from a language