bucket_brigade is too long to type in every function name. This just

changes to names of all of the brigade functions to ap_brigade_foo.
I don't think this should cause any confusion, and it sure makes coding
this stuff much easier.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@60463 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 19 insertions, 19 deletions

diff --git a/buckets/ap_buf.c b/buckets/ap_buf.c
index 92e8d6b72..1c6238da6 100644
--- a/buckets/ap_buf.c
+++ b/buckets/ap_buf.c
@@ -72,7 +72,7 @@ APR_EXPORT(ap_status_t) ap_bucket_destroy(ap_bucket *e)
     return APR_SUCCESS;
 }
 
-APR_EXPORT(ap_status_t) ap_bucket_brigade_destroy(void *data)
+APR_EXPORT(ap_status_t) ap_brigade_destroy(void *data)
 {
     ap_bucket_brigade *b = data;
 
@@ -97,7 +97,7 @@ APR_EXPORT(ap_status_t) ap_bucket_list_destroy(ap_bucket *e)
     return APR_SUCCESS;
 }
 
-APR_EXPORT(ap_bucket_brigade *) ap_bucket_brigade_create(ap_pool_t *p)
+APR_EXPORT(ap_bucket_brigade *) ap_brigade_create(ap_pool_t *p)
 {
     ap_bucket_brigade *b;
 
@@ -105,12 +105,12 @@ APR_EXPORT(ap_bucket_brigade *) ap_bucket_brigade_create(ap_pool_t *p)
     b->p = p;
     b->head = b->tail = NULL;
 
-    ap_register_cleanup(b->p, b, ap_bucket_brigade_destroy, 
-                        ap_bucket_brigade_destroy);
+    ap_register_cleanup(b->p, b, ap_brigade_destroy, 
+                        ap_brigade_destroy);
     return b;
 }
 
-APR_EXPORT(void) ap_bucket_brigade_append_buckets(ap_bucket_brigade *b, 
+APR_EXPORT(void) ap_brigade_append_buckets(ap_bucket_brigade *b, 
                                                   ap_bucket *e)
 {
     ap_bucket *cur = e;
@@ -128,7 +128,7 @@ APR_EXPORT(void) ap_bucket_brigade_append_buckets(ap_bucket_brigade *b,
     }
 }
 
-APR_EXPORT(int) ap_bucket_brigade_to_iovec(ap_bucket_brigade *b, 
+APR_EXPORT(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
                                            struct iovec *vec, int nvec)
 {
     ap_bucket *e;
@@ -146,7 +146,7 @@ APR_EXPORT(int) ap_bucket_brigade_to_iovec(ap_bucket_brigade *b,
     return vec - orig;
 }
 
-APR_EXPORT(void) ap_bucket_brigade_catenate(ap_bucket_brigade *a, 
+APR_EXPORT(void) ap_brigade_catenate(ap_bucket_brigade *a, 
                                             ap_bucket_brigade *b)
 {
     if (b->head) {
@@ -179,7 +179,7 @@ APR_EXPORT(void) ap_consume_buckets(ap_bucket_brigade *b, int nvec)
     }
 }
 
-APR_EXPORT(ap_status_t) ap_bucket_brigade_to_iol(ap_ssize_t *total_bytes,
+APR_EXPORT(ap_status_t) ap_brigade_to_iol(ap_ssize_t *total_bytes,
                                                  ap_bucket_brigade *b, 
                                                  ap_iol *iol)
 {
@@ -190,7 +190,7 @@ APR_EXPORT(ap_status_t) ap_bucket_brigade_to_iol(ap_ssize_t *total_bytes,
 
     *total_bytes = 0;
     do {
-        iov_used = ap_bucket_brigade_to_iovec(b, vec, 16);
+        iov_used = ap_brigade_to_iovec(b, vec, 16);
         status = iol_writev(iol, vec, iov_used, &bytes);
 
         ap_consume_buckets(b, 16);
@@ -248,7 +248,7 @@ APR_EXPORT(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
             }
             k += i;
 
-            ap_bucket_brigade_append_buckets(b, rw);
+            ap_brigade_append_buckets(b, rw);
         }        
     }
     
@@ -265,7 +265,7 @@ APR_EXPORT(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
         }
         k += i;
 
-        ap_bucket_brigade_append_buckets(b, r);
+        ap_brigade_append_buckets(b, r);
     }
 
     return k;
@@ -294,7 +294,7 @@ APR_EXPORT(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_lis
     res = ap_vsnprintf(buf, 4096, fmt, va);
 
     r = ap_bucket_rwmem_create(buf, strlen(buf), &i);
-    ap_bucket_brigade_append_buckets(b, r);
+    ap_brigade_append_buckets(b, r);
 
     return res;
 }
diff --git a/buckets/apr_buf.h b/buckets/apr_buf.h
index 9ed2621df..fa3098962 100644
--- a/buckets/apr_buf.h
+++ b/buckets/apr_buf.h
@@ -194,27 +194,27 @@ struct ap_bucket_mmap {
 /*   ******  Bucket Brigade Functions  *****  */
 
 /* Create a new bucket brigade */
-APR_EXPORT(ap_bucket_brigade *) ap_bucket_brigade_create(ap_pool_t *p);
+APR_EXPORT(ap_bucket_brigade *) ap_brigade_create(ap_pool_t *p);
 
 /* destroy an enitre bucket brigade */
-APR_EXPORT(ap_status_t) ap_bucket_brigade_destroy(void *b);
+APR_EXPORT(ap_status_t) ap_brigade_destroy(void *b);
 
 /* append bucket(s) to a bucket_brigade */
-APR_EXPORT(void) ap_bucket_brigade_append_buckets(ap_bucket_brigade *b,
+APR_EXPORT(void) ap_brigade_append_buckets(ap_bucket_brigade *b,
                                                   ap_bucket *e);
 
 /* consume nbytes from beginning of b -- call ap_bucket_destroy as
     appropriate, and/or modify start on last element */
-APR_EXPORT(void) ap_bucket_brigade_consume(ap_bucket_brigade *, int nbytes);
+APR_EXPORT(void) ap_brigade_consume(ap_bucket_brigade *, int nbytes);
 
 /* create an iovec of the elements in a bucket_brigade... return number 
     of elements used */
-APR_EXPORT(int) ap_bucket_brigade_to_iovec(ap_bucket_brigade *, 
+APR_EXPORT(int) ap_brigade_to_iovec(ap_bucket_brigade *, 
                                            struct iovec *vec, int nvec);
 
 /* catenate bucket_brigade b onto bucket_brigade a, bucket_brigade b is 
     empty after this */
-APR_EXPORT(void) ap_bucket_brigade_catenate(ap_bucket_brigade *a, 
+APR_EXPORT(void) ap_brigade_catenate(ap_bucket_brigade *a, 
                                             ap_bucket_brigade *b);
 
 /* Destroy the first nvec buckets. */
@@ -222,7 +222,7 @@ APR_EXPORT(void) ap_consume_buckets(ap_bucket_brigade *b, int nvec);
 
 /* save the buf out to the specified iol.  This can be used to flush the
     data to the disk, or to send it out to the network. */
-APR_EXPORT(ap_status_t) ap_bucket_brigade_to_iol(ap_ssize_t *total_bytes,
+APR_EXPORT(ap_status_t) ap_brigade_to_iol(ap_ssize_t *total_bytes,
                                                  ap_bucket_brigade *a, 
                                                  ap_iol *iol);