jwoolley 2003/07/01 23:35:59
Modified: buckets apr_buckets_alloc.c
include apr_buckets.h
Log:
revert the previous commit. i think there's a cleaner way. will try it
tomorrow. regardless, i don't want this addition to the api to get out
into the wild unless i'm sure it's needed, which i'm currently not.
Revision Changes Path
1.11 +1 -9 apr-util/buckets/apr_buckets_alloc.c
Index: apr_buckets_alloc.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_alloc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -u -r1.10 -r1.11
--- apr_buckets_alloc.c 2 Jul 2003 05:25:44 -0000 1.10
+++ apr_buckets_alloc.c 2 Jul 2003 06:35:59 -0000 1.11
@@ -90,18 +90,10 @@
APU_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create(apr_pool_t
*p)
{
apr_allocator_t *allocator;
-
- apr_allocator_create(&allocator);
- return apr_bucket_alloc_create_ex(p, allocator);
-}
-
-APU_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create_ex(
- apr_pool_t *p,
- apr_allocator_t *allocator)
-{
apr_bucket_alloc_t *list;
apr_memnode_t *block;
+ apr_allocator_create(&allocator);
block = apr_allocator_alloc(allocator, ALLOC_AMT);
list = (apr_bucket_alloc_t *)block->first_avail;
list->pool = p;
1.152 +1 -11 apr-util/include/apr_buckets.h
Index: apr_buckets.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_buckets.h,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -u -r1.151 -r1.152
--- apr_buckets.h 2 Jul 2003 05:25:44 -0000 1.151
+++ apr_buckets.h 2 Jul 2003 06:35:59 -0000 1.152
@@ -921,23 +921,13 @@
/* ***** Bucket freelist functions ***** */
/**
- * Create a bucket allocator (and its underlying apr_allocator_t).
+ * Create a bucket allocator.
* @param p Pool to allocate the allocator from [note: this is only
* used to allocate internal structures of the allocator, NOT
* to allocate the memory handed out by the allocator]
* @warning The allocator must never be used by more than one thread at a
time.
*/
APU_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create(apr_pool_t
*p);
-
-/**
- * Create a bucket allocator (specifying an apr_allocator_t for it to use).
- * @param p Pool to allocate the allocator from [note: this is only
- * used to allocate internal structures of the allocator,
NOT
- * to allocate the memory handed out by the allocator]
- * @param allocator The apr_allocator_t from which to get blocks of memory.
- * @warning The allocator must never be used by more than one thread at a
time.
- */
-APU_DECLARE_NONSTD(apr_bucket_alloc_t *)
apr_bucket_alloc_create_ex(apr_pool_t *p, apr_allocator_t *allocator);
/**
* Destroy a bucket allocator.
