httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/buckets ap_buf.c apr_buf.h
Date Mon, 31 Jul 2000 23:23:40 GMT
rbb         00/07/31 16:23:39

  Modified:    src/lib/apr/buckets ap_buf.c apr_buf.h
  Log:
  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.
  
  Revision  Changes    Path
  1.19      +12 -12    apache-2.0/src/lib/apr/buckets/ap_buf.c
  
  Index: ap_buf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/ap_buf.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ap_buf.c	2000/07/31 22:28:57	1.18
  +++ ap_buf.c	2000/07/31 23:23:38	1.19
  @@ -72,7 +72,7 @@
       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 @@
       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 @@
       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(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 @@
       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(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 @@
   
       *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 @@
               }
               k += i;
   
  -            ap_bucket_brigade_append_buckets(b, rw);
  +            ap_brigade_append_buckets(b, rw);
           }        
       }
       
  @@ -265,7 +265,7 @@
           }
           k += i;
   
  -        ap_bucket_brigade_append_buckets(b, r);
  +        ap_brigade_append_buckets(b, r);
       }
   
       return k;
  @@ -294,7 +294,7 @@
       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;
   }
  
  
  
  1.19      +7 -7      apache-2.0/src/lib/apr/buckets/apr_buf.h
  
  Index: apr_buf.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/apr_buf.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- apr_buf.h	2000/07/31 22:28:58	1.18
  +++ apr_buf.h	2000/07/31 23:23:38	1.19
  @@ -194,27 +194,27 @@
   /*   ******  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 @@
   
   /* 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);
   
  
  
  

Mime
View raw message