apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: apr-util/buckets apr_buckets_eos.c apr_buckets_file.c apr_buckets_flush.c apr_buckets_heap.c apr_buckets_mmap.c apr_buckets_pipe.c apr_buckets_pool.c apr_buckets_simple.c apr_buckets_socket.c
Date Thu, 18 Apr 2002 18:34:27 GMT
jwoolley    02/04/18 11:34:27

  Modified:    buckets  apr_buckets_eos.c apr_buckets_file.c
                        apr_buckets_flush.c apr_buckets_heap.c
                        apr_buckets_mmap.c apr_buckets_pipe.c
                        apr_buckets_pool.c apr_buckets_simple.c
                        apr_buckets_socket.c
  Log:
  Insert "bucket_" into the names of these static functions to make
  backtraces easier to read.
  
  Revision  Changes    Path
  1.34      +3 -3      apr-util/buckets/apr_buckets_eos.c
  
  Index: apr_buckets_eos.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_eos.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -d -u -r1.33 -r1.34
  --- apr_buckets_eos.c	29 Mar 2002 08:12:08 -0000	1.33
  +++ apr_buckets_eos.c	18 Apr 2002 18:34:27 -0000	1.34
  @@ -54,8 +54,8 @@
   
   #include "apr_buckets.h"
   
  -static apr_status_t eos_read(apr_bucket *b, const char **str, 
  -                                apr_size_t *len, apr_read_type_e block)
  +static apr_status_t eos_bucket_read(apr_bucket *b, const char **str, 
  +                                    apr_size_t *len, apr_read_type_e block)
   {
       *str = NULL;
       *len = 0;
  @@ -85,7 +85,7 @@
   APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_eos = {
       "EOS", 5,
       apr_bucket_destroy_noop,
  -    eos_read,
  +    eos_bucket_read,
       apr_bucket_setaside_noop,
       apr_bucket_split_notimpl,
       apr_bucket_simple_copy
  
  
  
  1.68      +9 -9      apr-util/buckets/apr_buckets_file.c
  
  Index: apr_buckets_file.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_file.c,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -d -u -r1.67 -r1.68
  --- apr_buckets_file.c	9 Apr 2002 03:57:47 -0000	1.67
  +++ apr_buckets_file.c	18 Apr 2002 18:34:27 -0000	1.68
  @@ -67,7 +67,7 @@
   
   #endif /* APR_HAS_MMAP */
   
  -static void file_destroy(void *data)
  +static void file_bucket_destroy(void *data)
   {
       apr_bucket_file *f = data;
   
  @@ -102,13 +102,13 @@
           return 0;
       }
       apr_bucket_mmap_make(e, mm, 0, filelength);
  -    file_destroy(a);
  +    file_bucket_destroy(a);
       return 1;
   }
   #endif
   
  -static apr_status_t file_read(apr_bucket *e, const char **str,
  -			      apr_size_t *len, apr_read_type_e block)
  +static apr_status_t file_bucket_read(apr_bucket *e, const char **str,
  +                                     apr_size_t *len, apr_read_type_e block)
   {
       apr_bucket_file *a = e->data;
       apr_file_t *f = a->fd;
  @@ -181,7 +181,7 @@
           APR_BUCKET_INSERT_AFTER(e, b);
       }
       else {
  -        file_destroy(a);
  +        file_bucket_destroy(a);
       }
   
       *str = buf;
  @@ -217,7 +217,7 @@
       return apr_bucket_file_make(b, fd, offset, len, p);
   }
   
  -static apr_status_t file_setaside(apr_bucket *data, apr_pool_t *reqpool)
  +static apr_status_t file_bucket_setaside(apr_bucket *data, apr_pool_t *reqpool)
   {
       apr_bucket_file *a = data->data;
       apr_file_t *fd = NULL;
  @@ -248,9 +248,9 @@
   
   APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_file = {
       "FILE", 5,
  -    file_destroy,
  -    file_read,
  -    file_setaside,
  +    file_bucket_destroy,
  +    file_bucket_read,
  +    file_bucket_setaside,
       apr_bucket_shared_split,
       apr_bucket_shared_copy
   };
  
  
  
  1.26      +3 -3      apr-util/buckets/apr_buckets_flush.c
  
  Index: apr_buckets_flush.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_flush.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -d -u -r1.25 -r1.26
  --- apr_buckets_flush.c	29 Mar 2002 08:12:08 -0000	1.25
  +++ apr_buckets_flush.c	18 Apr 2002 18:34:27 -0000	1.26
  @@ -54,8 +54,8 @@
   
   #include "apr_buckets.h"
   
  -static apr_status_t flush_read(apr_bucket *b, const char **str, 
  -                                apr_size_t *len, apr_read_type_e block)
  +static apr_status_t flush_bucket_read(apr_bucket *b, const char **str, 
  +                                      apr_size_t *len, apr_read_type_e block)
   {
       *str = NULL;
       *len = 0;
  @@ -85,7 +85,7 @@
   APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_flush = {
       "FLUSH", 5,
       apr_bucket_destroy_noop,
  -    flush_read,
  +    flush_bucket_read,
       apr_bucket_setaside_noop,
       apr_bucket_split_notimpl,
       apr_bucket_simple_copy
  
  
  
  1.43      +5 -5      apr-util/buckets/apr_buckets_heap.c
  
  Index: apr_buckets_heap.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_heap.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -d -u -r1.42 -r1.43
  --- apr_buckets_heap.c	29 Mar 2002 22:19:03 -0000	1.42
  +++ apr_buckets_heap.c	18 Apr 2002 18:34:27 -0000	1.43
  @@ -56,8 +56,8 @@
   #define APR_WANT_MEMFUNC
   #include "apr_want.h"
   
  -static apr_status_t heap_read(apr_bucket *b, const char **str, 
  -			      apr_size_t *len, apr_read_type_e block)
  +static apr_status_t heap_bucket_read(apr_bucket *b, const char **str, 
  +                                     apr_size_t *len, apr_read_type_e block)
   {
       apr_bucket_heap *h = b->data;
   
  @@ -66,7 +66,7 @@
       return APR_SUCCESS;
   }
   
  -static void heap_destroy(void *data)
  +static void heap_bucket_destroy(void *data)
   {
       apr_bucket_heap *h = data;
   
  @@ -126,8 +126,8 @@
   
   APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_heap = {
       "HEAP", 5,
  -    heap_destroy,
  -    heap_read,
  +    heap_bucket_destroy,
  +    heap_bucket_read,
       apr_bucket_setaside_noop,
       apr_bucket_shared_split,
       apr_bucket_shared_copy
  
  
  
  1.49      +7 -7      apr-util/buckets/apr_buckets_mmap.c
  
  Index: apr_buckets_mmap.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_mmap.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -d -u -r1.48 -r1.49
  --- apr_buckets_mmap.c	29 Mar 2002 08:12:08 -0000	1.48
  +++ apr_buckets_mmap.c	18 Apr 2002 18:34:27 -0000	1.49
  @@ -56,8 +56,8 @@
   
   #if APR_HAS_MMAP
   
  -static apr_status_t mmap_read(apr_bucket *b, const char **str, 
  -                              apr_size_t *length, apr_read_type_e block)
  +static apr_status_t mmap_bucket_read(apr_bucket *b, const char **str, 
  +                                     apr_size_t *length, apr_read_type_e block)
   {
       apr_bucket_mmap *m = b->data;
       apr_status_t ok;
  @@ -72,7 +72,7 @@
       return APR_SUCCESS;
   }
   
  -static void mmap_destroy(void *data)
  +static void mmap_bucket_destroy(void *data)
   {
       apr_bucket_mmap *m = data;
   
  @@ -116,7 +116,7 @@
       return apr_bucket_mmap_make(b, mm, start, length);
   }
   
  -static apr_status_t mmap_setaside(apr_bucket *data, apr_pool_t *p)
  +static apr_status_t mmap_bucket_setaside(apr_bucket *data, apr_pool_t *p)
   {
       apr_bucket_mmap *m = data->data;
       apr_mmap_t *mm = m->mmap;
  @@ -137,9 +137,9 @@
   
   APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_mmap = {
       "MMAP", 5,
  -    mmap_destroy,
  -    mmap_read,
  -    mmap_setaside,
  +    mmap_bucket_destroy,
  +    mmap_bucket_read,
  +    mmap_bucket_setaside,
       apr_bucket_shared_split,
       apr_bucket_shared_copy
   };
  
  
  
  1.47      +6 -6      apr-util/buckets/apr_buckets_pipe.c
  
  Index: apr_buckets_pipe.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_pipe.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -d -u -r1.46 -r1.47
  --- apr_buckets_pipe.c	29 Mar 2002 22:29:19 -0000	1.46
  +++ apr_buckets_pipe.c	18 Apr 2002 18:34:27 -0000	1.47
  @@ -54,8 +54,8 @@
   
   #include "apr_buckets.h"
   
  -static apr_status_t pipe_read(apr_bucket *a, const char **str,
  -			      apr_size_t *len, apr_read_type_e block)
  +static apr_status_t pipe_bucket_read(apr_bucket *a, const char **str,
  +                                     apr_size_t *len, apr_read_type_e block)
   {
       apr_file_t *p = a->data;
       char *buf;
  @@ -116,8 +116,8 @@
   APU_DECLARE(apr_bucket *) apr_bucket_pipe_make(apr_bucket *b, apr_file_t *p)
   {
       /*
  -     * A pipe is closed when the end is reached in pipe_read().  If the
  -     * pipe isn't read to the end (e.g., error path), the pipe will be
  +     * A pipe is closed when the end is reached in pipe_bucket_read().  If
  +     * the pipe isn't read to the end (e.g., error path), the pipe will be
        * closed when its pool goes away.
        *
        * Note that typically the pipe is allocated from the request pool
  @@ -126,7 +126,7 @@
        * response if the connection is pipelined. This turns out not to
        * be a problem because the core will have read to the end of the
        * stream so the bucket(s) that it sets aside will be the heap
  -     * buckets created by pipe_read() above.
  +     * buckets created by pipe_bucket_read() above.
        */
       b->type     = &apr_bucket_type_pipe;
       b->length   = (apr_size_t)(-1);
  @@ -150,7 +150,7 @@
   APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_pipe = {
       "PIPE", 5,
       apr_bucket_destroy_noop,
  -    pipe_read,
  +    pipe_bucket_read,
       apr_bucket_setaside_notimpl,
       apr_bucket_split_notimpl,
       apr_bucket_copy_notimpl
  
  
  
  1.29      +5 -5      apr-util/buckets/apr_buckets_pool.c
  
  Index: apr_buckets_pool.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_pool.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -d -u -r1.28 -r1.29
  --- apr_buckets_pool.c	29 Mar 2002 22:19:02 -0000	1.28
  +++ apr_buckets_pool.c	18 Apr 2002 18:34:27 -0000	1.29
  @@ -80,8 +80,8 @@
       return APR_SUCCESS;
   }
   
  -static apr_status_t pool_read(apr_bucket *b, const char **str, 
  -			      apr_size_t *len, apr_read_type_e block)
  +static apr_status_t pool_bucket_read(apr_bucket *b, const char **str, 
  +                                     apr_size_t *len, apr_read_type_e block)
   {
       apr_bucket_pool *p = b->data;
       const char *base = p->base;
  @@ -99,7 +99,7 @@
       return APR_SUCCESS;
   }
   
  -static void pool_destroy(void *data)
  +static void pool_bucket_destroy(void *data)
   {
       apr_bucket_pool *p = data;
   
  @@ -172,8 +172,8 @@
   
   APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_pool = {
       "POOL", 5,
  -    pool_destroy,
  -    pool_read,
  +    pool_bucket_destroy,
  +    pool_bucket_read,
       apr_bucket_setaside_noop, /* don't need to setaside thanks to the cleanup*/
       apr_bucket_shared_split,
       apr_bucket_shared_copy
  
  
  
  1.39      +6 -6      apr-util/buckets/apr_buckets_simple.c
  
  Index: apr_buckets_simple.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_simple.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -d -u -r1.38 -r1.39
  --- apr_buckets_simple.c	29 Mar 2002 08:12:08 -0000	1.38
  +++ apr_buckets_simple.c	18 Apr 2002 18:34:27 -0000	1.39
  @@ -83,8 +83,8 @@
       return APR_SUCCESS;
   }
   
  -static apr_status_t simple_read(apr_bucket *b, const char **str, 
  -				apr_size_t *len, apr_read_type_e block)
  +static apr_status_t simple_bucket_read(apr_bucket *b, const char **str, 
  +                                       apr_size_t *len, apr_read_type_e block)
   {
       *str = (char *)b->data + b->start;
       *len = b->length;
  @@ -123,7 +123,7 @@
    * function that co-ordinates the action of all the bucket setaside
    * functions to improve memory efficiency.
    */
  -static apr_status_t transient_setaside(apr_bucket *b, apr_pool_t *pool)
  +static apr_status_t transient_bucket_setaside(apr_bucket *b, apr_pool_t *pool)
   {
       b = apr_bucket_heap_make(b, (char *)b->data + b->start, b->length, NULL);
       if (b == NULL) {
  @@ -157,7 +157,7 @@
   const apr_bucket_type_t apr_bucket_type_immortal = {
       "IMMORTAL", 5,
       apr_bucket_destroy_noop,
  -    simple_read,
  +    simple_bucket_read,
       apr_bucket_setaside_noop,
       apr_bucket_simple_split,
       apr_bucket_simple_copy
  @@ -166,8 +166,8 @@
   APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_transient = {
       "TRANSIENT", 5,
       apr_bucket_destroy_noop, 
  -    simple_read,
  -    transient_setaside,
  +    simple_bucket_read,
  +    transient_bucket_setaside,
       apr_bucket_simple_split,
       apr_bucket_simple_copy
   };
  
  
  
  1.37      +3 -3      apr-util/buckets/apr_buckets_socket.c
  
  Index: apr_buckets_socket.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/apr_buckets_socket.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -d -u -r1.36 -r1.37
  --- apr_buckets_socket.c	29 Mar 2002 08:12:08 -0000	1.36
  +++ apr_buckets_socket.c	18 Apr 2002 18:34:27 -0000	1.37
  @@ -54,8 +54,8 @@
   
   #include "apr_buckets.h"
   
  -static apr_status_t socket_read(apr_bucket *a, const char **str,
  -			      apr_size_t *len, apr_read_type_e block)
  +static apr_status_t socket_bucket_read(apr_bucket *a, const char **str,
  +                                       apr_size_t *len, apr_read_type_e block)
   {
       apr_socket_t *p = a->data;
       char *buf;
  @@ -145,7 +145,7 @@
   APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_socket = {
       "SOCKET", 5,
       apr_bucket_destroy_noop,
  -    socket_read,
  +    socket_bucket_read,
       apr_bucket_setaside_notimpl, 
       apr_bucket_split_notimpl,
       apr_bucket_copy_notimpl
  
  
  

Mime
View raw message