summaryrefslogtreecommitdiff
path: root/shmem
diff options
context:
space:
mode:
authorRyan Bloom <rbb@apache.org>1999-08-31 05:32:53 +0000
committerRyan Bloom <rbb@apache.org>1999-08-31 05:32:53 +0000
commitd8bb029e1606cec52af7ed92e37e0af4ce03e364 (patch)
treeb0538e9e29dff02e4e52005cc29b8007cdf9748c /shmem
parenta51b4dac38899a3c43f003f1bc2de7136f811409 (diff)
downloadapr-d8bb029e1606cec52af7ed92e37e0af4ce03e364.tar.gz
Changed pools to contexts. Tested with prefork and pthread mpm's. I'll
check this out tomorrow and make sure everything was checked in correctly. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@59183 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
-rw-r--r--shmem/shmem.c2
-rw-r--r--shmem/unix/mm/mm_alloc.c6
-rw-r--r--shmem/unix/shmem.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/shmem/shmem.c b/shmem/shmem.c
index 7dc7768cf..735256e7c 100644
--- a/shmem/shmem.c
+++ b/shmem/shmem.c
@@ -112,7 +112,7 @@ ap_status_t ap_shm_realloc(struct shmem_t *shared, ap_size_t size, void **entity
return APR_SUCCESS;
}
-ap_status_t apr_shm_free(struct shmem_t *shared, void *entity)
+ap_status_t ap_shm_free(struct shmem_t *shared, void *entity)
{
mm_free(shared->mm, entity);
return APR_SUCCESS;
diff --git a/shmem/unix/mm/mm_alloc.c b/shmem/unix/mm/mm_alloc.c
index 812a4d17b..90e851cad 100644
--- a/shmem/unix/mm/mm_alloc.c
+++ b/shmem/unix/mm/mm_alloc.c
@@ -77,7 +77,7 @@ MM *mm_create(size_t usize, const char *file)
if ((core = mm_core_create(size, file)) == NULL)
return NULL;
- /* fill in the memory pool structure */
+ /* fill in the memory ap_context_t structure */
mm = (MM *)core;
mm->mp_size = size;
mm->mp_offset = SIZEOF_mem_pool;
@@ -115,7 +115,7 @@ void mm_destroy(MM *mm)
}
/*
- * Lock a memory pool
+ * Lock a memory ap_context_t
*/
int mm_lock(MM *mm, mm_lock_mode mode)
{
@@ -125,7 +125,7 @@ int mm_lock(MM *mm, mm_lock_mode mode)
}
/*
- * Unlock a memory pool
+ * Unlock a memory ap_context_t
*/
int mm_unlock(MM *mm)
{
diff --git a/shmem/unix/shmem.c b/shmem/unix/shmem.c
index 8db258c3d..848e4fece 100644
--- a/shmem/unix/shmem.c
+++ b/shmem/unix/shmem.c
@@ -118,7 +118,7 @@ ap_status_t ap_shm_realloc(struct shmem_t *shared, ap_size_t size, void **entity
return APR_SUCCESS;
}
-ap_status_t apr_shm_free(struct shmem_t *shared, void *entity)
+ap_status_t ap_shm_free(struct shmem_t *shared, void *entity)
{
mm_free(shared->mm, entity);
return APR_SUCCESS;