You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2005/07/28 16:03:18 UTC
svn commit: r225776 - /apr/apr-util/branches/0.9.x/include/apr_rmm.h
Author: jorton
Date: Thu Jul 28 07:03:14 2005
New Revision: 225776
URL: http://svn.apache.org/viewcvs?rev=225776&view=rev
Log:
Merge r225774 from trunk:
* include/apr_rmm.h: Comment, style fixes.
Modified:
apr/apr-util/branches/0.9.x/include/apr_rmm.h
Modified: apr/apr-util/branches/0.9.x/include/apr_rmm.h
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/include/apr_rmm.h?rev=225776&r1=225775&r2=225776&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/include/apr_rmm.h (original)
+++ apr/apr-util/branches/0.9.x/include/apr_rmm.h Thu Jul 28 07:03:14 2005
@@ -39,21 +39,22 @@
/** Structure to access Relocatable, Managed Memory */
typedef struct apr_rmm_t apr_rmm_t;
-/** Fundemental allocation unit, within a spcific apr_rmm_off_t */
+/** Fundamental allocation unit, within a specific apr_rmm_t */
typedef apr_size_t apr_rmm_off_t;
/**
* Initialize a relocatable memory block to be managed by the apr_rmm API.
* @param rmm The relocatable memory block
- * @param lock An apr_anylock_t of the appropriate type of lock
- * @param membuf The block of relocateable memory to be managed
- * @param memsize The size of relocateable memory block to be managed
+ * @param lock An apr_anylock_t of the appropriate type of lock, or NULL
+ * if no locking is required.
+ * @param membuf The block of relocatable memory to be managed
+ * @param memsize The size of relocatable memory block to be managed
* @param cont The pool to use for local storage and management
* @remark Both @param membuf and @param memsize must be aligned
* (for instance using APR_ALIGN_DEFAULT).
*/
APU_DECLARE(apr_status_t) apr_rmm_init(apr_rmm_t **rmm, apr_anylock_t *lock,
- void* membuf, apr_size_t memsize,
+ void *membuf, apr_size_t memsize,
apr_pool_t *cont);
/**
@@ -66,11 +67,11 @@
* Attach to a relocatable memory block already managed by the apr_rmm API.
* @param rmm The relocatable memory block
* @param lock An apr_anylock_t of the appropriate type of lock
- * @param membuf The block of relocateable memory already under management
+ * @param membuf The block of relocatable memory already under management
* @param cont The pool to use for local storage and management
*/
APU_DECLARE(apr_status_t) apr_rmm_attach(apr_rmm_t **rmm, apr_anylock_t *lock,
- void* membuf, apr_pool_t *cont);
+ void *membuf, apr_pool_t *cont);
/**
* Detach from the managed block of memory.
@@ -120,7 +121,7 @@
* @param rmm The relocatable memory block
* @param entity The physical address to convert to an offset
*/
-APU_DECLARE(apr_rmm_off_t) apr_rmm_offset_get(apr_rmm_t *rmm, void* entity);
+APU_DECLARE(apr_rmm_off_t) apr_rmm_offset_get(apr_rmm_t *rmm, void *entity);
/**
* Compute the required overallocation of memory needed to fit n allocs