apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apr-util/src/buckets Makefile.in ap_buckets.c ap_buckets_eos.c ap_buckets_file.c ap_buckets_flush.c ap_buckets_heap.c ap_buckets_mmap.c ap_buckets_pipe.c ap_buckets_pool.c ap_buckets_refcount.c ap_buckets_simple.c ap_buckets_socket.c
Date Tue, 05 Dec 2000 01:02:57 GMT
rbb         00/12/04 17:02:55

  Modified:    build    .cvsignore
               include  ap_buckets.h
               src/buckets Makefile.in ap_buckets.c ap_buckets_eos.c
                        ap_buckets_file.c ap_buckets_flush.c
                        ap_buckets_heap.c ap_buckets_mmap.c
                        ap_buckets_pipe.c ap_buckets_pool.c
                        ap_buckets_refcount.c ap_buckets_simple.c
                        ap_buckets_socket.c
  Log:
  Get the buckets building in apr-util
  
  Revision  Changes    Path
  1.2       +1 -0      apr-util/build/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/apr-util/build/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	2000/12/02 16:13:47	1.1
  +++ .cvsignore	2000/12/05 01:02:45	1.2
  @@ -1,3 +1,4 @@
  +Makefile
   config.guess
   config.sub
   ltconfig
  
  
  
  1.51      +45 -41    apr-util/include/ap_buckets.h
  
  Index: ap_buckets.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/ap_buckets.h,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- ap_buckets.h	2000/11/10 04:53:24	1.50
  +++ ap_buckets.h	2000/12/05 01:02:46	1.51
  @@ -55,15 +55,17 @@
   #ifndef AP_BUCKETS_H
   #define AP_BUCKETS_H
   
  -#include "httpd.h"
  +#include "apr_network_io.h"
  +#include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_mmap.h"
   #include "apr_errno.h"
   #include "ap_ring.h"
  -#ifdef HAVE_SYS_UIO_H
  +#include "apr.h"
  +#ifdef APR_HAVE_SYS_UIO_H
   #include <sys/uio.h>	/* for struct iovec */
   #endif
  -#ifdef HAVE_STDARG_H
  +#ifdef APR_HAVE_STDARG_H
   #include <stdarg.h>
   #endif
   
  @@ -393,7 +395,7 @@
    * @return The empty bucket brigade
    * @deffunc ap_bucket_brigade *ap_brigade_create(apr_pool_t *p)
    */
  -AP_DECLARE(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p);
  +APR_DECLARE(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p);
   
   /**
    * destroy an entire bucket brigade.  This includes destroying all of the
  @@ -401,7 +403,7 @@
    * @param b The bucket brigade to destroy
    * @deffunc apr_status_t ap_brigade_destroy(ap_bucket_brigade *b)
    */
  -AP_DECLARE(apr_status_t) ap_brigade_destroy(ap_bucket_brigade *b);
  +APR_DECLARE(apr_status_t) ap_brigade_destroy(ap_bucket_brigade *b);
   
   /**
    * Split a bucket brigade into two, such that the given bucket is the
  @@ -413,7 +415,7 @@
    * @return The new brigade
    * @deffunc ap_bucket_brigade *ap_brigade_split(ap_bucket_brigade *b, ap_bucket *e)
    */
  -AP_DECLARE(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
  +APR_DECLARE(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
   						 ap_bucket *e);
   
   /**
  @@ -422,7 +424,7 @@
    * @param b The brigade to consume data from
    * @param nbytes The number of bytes to consume
    * @deffunc void ap_brigade_consume(ap_bucket_brigade *b, int nbytes) */
  -AP_DECLARE(void) ap_brigade_consume(ap_bucket_brigade *b, int nbytes);
  +APR_DECLARE(void) ap_brigade_consume(ap_bucket_brigade *b, int nbytes);
   
   /**
    * create an iovec of the elements in a bucket_brigade... return number 
  @@ -434,7 +436,7 @@
    * @return The number of iovec elements actually filled out.
    * @deffunc int ap_brigade_to_iovec(ap_bucket_brigade *b, struct iovec *vec, int nvec);
    */
  -AP_DECLARE(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
  +APR_DECLARE(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
   				    struct iovec *vec, int nvec);
   
   /**
  @@ -445,7 +447,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
    */
  -AP_DECLARE(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va);
  +APR_DECLARE(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va);
   
   /**
    * This function writes an unspecified number of strings into a bucket brigade.
  @@ -455,7 +457,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_putstrs(ap_bucket_brigade *b, ...)
    */
  -AP_DECLARE_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...);
  +APR_DECLARE_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...);
   
   /**
    * Evaluate a printf and put the resulting string into a bucket at the end 
  @@ -466,7 +468,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...) 
    */
  -AP_DECLARE_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...);
  +APR_DECLARE_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...);
   
   /**
    * Evaluate a printf and put the resulting string into a bucket at the end 
  @@ -477,7 +479,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va) 
    */
  -AP_DECLARE(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va);
  +APR_DECLARE(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va);
   
   
   /*  *****  Bucket Functions  *****  */
  @@ -531,10 +533,10 @@
   
   /* Bucket type handling */
   
  -AP_DECLARE_NONSTD(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data);
  -AP_DECLARE_NONSTD(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, 
  +APR_DECLARE_NONSTD(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data);
  +APR_DECLARE_NONSTD(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, 
                                                    apr_off_t point);
  -AP_DECLARE_NONSTD(void) ap_bucket_destroy_notimpl(void *data);
  +APR_DECLARE_NONSTD(void) ap_bucket_destroy_notimpl(void *data);
   /* There is no ap_bucket_read_notimpl, because it is a required function
    */
   int ap_insert_bucket_type(const ap_bucket_type *type);
  @@ -569,8 +571,9 @@
    * @param end The end of the data in the bucket
    *            relative to the private base pointer
    * @return The new bucket, or NULL if allocation failed
  - * @deffunc AP_DECLARE(ap_bucket *) ap_bucket_shared_create(ap_bucket_refcount *r, apr_off_t
start, apr_off_t end) */
  -AP_DECLARE(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
  + * @deffunc ap_bucket *ap_bucket_shared_create(ap_bucket_refcount *r, apr_off_t start,
apr_off_t end) 
  + */
  +APR_DECLARE(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
   					      apr_off_t start, apr_off_t end);
   
   /**
  @@ -581,8 +584,9 @@
    * @return NULL if nothing needs to be done,
    *         otherwise a pointer to the private data structure which
    *         must be destroyed because its reference count is zero
  - * @deffunc AP_DECLARE(void *) ap_bucket_shared_destroy(ap_bucket *b) */
  -AP_DECLARE(void *) ap_bucket_destroy_shared(void *data);
  + * @deffunc void *ap_bucket_shared_destroy(ap_bucket *b)
  + */
  +APR_DECLARE(void *) ap_bucket_destroy_shared(void *data);
   
   /**
    * Split a bucket into two at the given point, and adjust the refcount
  @@ -594,9 +598,9 @@
    * @return APR_EINVAL if the point is not within the bucket;
    *         APR_ENOMEM if allocation failed;
    *         or APR_SUCCESS
  - * @deffunc AP_DECLARE(apr_status_t) ap_bucket_shared_split(ap_bucket *b, apr_off_t point)
  + * @deffunc apr_status_t ap_bucket_shared_split(ap_bucket *b, apr_off_t point)
    */
  -AP_DECLARE_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *b, apr_off_t point);
  +APR_DECLARE_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *b, apr_off_t point);
   
   
   /*  *****  Functions to Create Buckets of varying type  *****  */
  @@ -638,8 +642,8 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_eos(void)
    */
  -AP_DECLARE(ap_bucket *) ap_bucket_create_eos(void);
  -AP_DECLARE(ap_bucket *) ap_bucket_make_eos(ap_bucket *b);
  +APR_DECLARE(ap_bucket *) ap_bucket_create_eos(void);
  +APR_DECLARE(ap_bucket *) ap_bucket_make_eos(ap_bucket *b);
   
   /**
    * Create a flush  bucket.  This indicates that filters should flush their
  @@ -648,8 +652,8 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_flush(void)
    */
  -AP_DECLARE(ap_bucket *) ap_bucket_create_flush(void);
  -AP_DECLARE(ap_bucket *) ap_bucket_make_flush(ap_bucket *b);
  +APR_DECLARE(ap_bucket *) ap_bucket_create_flush(void);
  +APR_DECLARE(ap_bucket *) ap_bucket_make_flush(ap_bucket *b);
   
   /**
    * Create a bucket referring to long-lived data.
  @@ -658,9 +662,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_transient(const char *buf, apr_size_t nbyte, apr_size_t
*w)
    */
  -AP_DECLARE(ap_bucket *) ap_bucket_create_immortal(
  +APR_DECLARE(ap_bucket *) ap_bucket_create_immortal(
   		const char *buf, apr_size_t nbyte);
  -AP_DECLARE(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
   		const char *buf, apr_size_t nbyte);
   
   /**
  @@ -670,9 +674,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_transient(const char *buf, apr_size_t nbyte, apr_size_t
*w)
    */
  -AP_DECLARE(ap_bucket *) ap_bucket_create_transient(
  +APR_DECLARE(ap_bucket *) ap_bucket_create_transient(
   		const char *buf, apr_size_t nbyte);
  -AP_DECLARE(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
   		const char *buf, apr_size_t nbyte);
   
   /**
  @@ -690,9 +694,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_heap(const char *buf, apr_size_t nbyte, int copy,
apr_size_t *w)
    */
  -AP_DECLARE(ap_bucket *) ap_bucket_create_heap(
  +APR_DECLARE(ap_bucket *) ap_bucket_create_heap(
   		const char *buf, apr_size_t nbyte, int copy, apr_size_t *w);
  -AP_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
   		const char *buf, apr_size_t nbyte, int copy, apr_size_t *w);
   
   /**
  @@ -702,9 +706,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_pool(const char *buf, apr_size_t *length, apr_pool_t
*p)
    */
  -AP_DECLARE(ap_bucket *) ap_bucket_create_pool(const char *buf,  
  +APR_DECLARE(ap_bucket *) ap_bucket_create_pool(const char *buf,  
                                               apr_size_t length, apr_pool_t *p);
  -AP_DECLARE(ap_bucket *) ap_bucket_make_pool(ap_bucket *b,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_pool(ap_bucket *b,
   		const char *buf, apr_size_t length, apr_pool_t *p);
   
   /**
  @@ -716,9 +720,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_mmap(const apr_mmap_t *buf, apr_size_t nbyte, apr_size_t
*w)
    */
  -AP_DECLARE(ap_bucket *) ap_bucket_create_mmap(
  +APR_DECLARE(ap_bucket *) ap_bucket_create_mmap(
   		apr_mmap_t *mm, apr_off_t start, apr_size_t length);
  -AP_DECLARE(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
   		apr_mmap_t *mm, apr_off_t start, apr_size_t length);
   
   /**
  @@ -727,8 +731,8 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_socket(apr_socket_t *thissocket)
    */
  -AP_DECLARE(ap_bucket *) ap_bucket_create_socket(apr_socket_t *thissock);
  -AP_DECLARE(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *thissock);
  +APR_DECLARE(ap_bucket *) ap_bucket_create_socket(apr_socket_t *thissock);
  +APR_DECLARE(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *thissock);
   
   /**
    * Create a bucket referring to a pipe.
  @@ -736,8 +740,8 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_pipe(apr_file_t *thispipe)
    */
  -AP_DECLARE(ap_bucket *) ap_bucket_create_pipe(apr_file_t *thispipe);
  -AP_DECLARE(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *thispipe);
  +APR_DECLARE(ap_bucket *) ap_bucket_create_pipe(apr_file_t *thispipe);
  +APR_DECLARE(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *thispipe);
   
   /**
    * Create a bucket referring to a file.
  @@ -747,8 +751,8 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_file(apr_file_t *thispipe)
    */
  -AP_DECLARE(ap_bucket *) ap_bucket_create_file(apr_file_t *fd, apr_off_t offset, apr_size_t
len);
  -AP_DECLARE(ap_bucket *) ap_bucket_make_file(ap_bucket *b, apr_file_t *fd, 
  +APR_DECLARE(ap_bucket *) ap_bucket_create_file(apr_file_t *fd, apr_off_t offset, apr_size_t
len);
  +APR_DECLARE(ap_bucket *) ap_bucket_make_file(ap_bucket *b, apr_file_t *fd, 
                                               apr_off_t offset, apr_size_t len);
   
   #endif /* !AP_BUCKETS_H */
  
  
  
  1.2       +4 -0      apr-util/src/buckets/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	2000/12/02 16:13:48	1.1
  +++ Makefile.in	2000/12/05 01:02:48	1.2
  @@ -1,3 +1,7 @@
   
  +TARGETS = ap_buckets_file.lo ap_buckets_pool.lo ap_buckets_flush.lo \
  +ap_buckets_refcount.lo ap_buckets_heap.lo ap_buckets_simple.lo ap_buckets.lo \
  +ap_buckets_mmap.lo ap_buckets_socket.lo ap_buckets_eos.lo ap_buckets_pipe.lo
  +
   top_builddir = @top_builddir@
   include $(top_builddir)/build/rules.mk
  
  
  
  1.33      +12 -12    apr-util/src/buckets/ap_buckets.c
  
  Index: ap_buckets.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- ap_buckets.c	2000/11/26 04:47:28	1.32
  +++ ap_buckets.c	2000/12/05 01:02:48	1.33
  @@ -54,6 +54,7 @@
   
   #include "apr.h"
   #include "apr_pools.h"
  +#include "apr_tables.h"
   #include "apr_errno.h"
   
   #include <stdlib.h>
  @@ -61,7 +62,6 @@
   #include <sys/uio.h>
   #endif
   
  -#include "httpd.h"
   #include "ap_buckets.h"
   
   static apr_array_header_t *bucket_types;
  @@ -85,13 +85,13 @@
        */
       return APR_SUCCESS;
   }
  -AP_DECLARE(apr_status_t) ap_brigade_destroy(ap_bucket_brigade *b)
  +APR_DECLARE(apr_status_t) ap_brigade_destroy(ap_bucket_brigade *b)
   {
       apr_kill_cleanup(b->p, b, ap_brigade_cleanup);
       return ap_brigade_cleanup(b);
   }
   
  -AP_DECLARE(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p)
  +APR_DECLARE(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p)
   {
       ap_bucket_brigade *b;
   
  @@ -103,7 +103,7 @@
       return b;
   }
   
  -AP_DECLARE(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
  +APR_DECLARE(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
   						 ap_bucket *e)
   {
       ap_bucket_brigade *a;
  @@ -121,7 +121,7 @@
       return a;
   }
   
  -AP_DECLARE(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
  +APR_DECLARE(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
   				    struct iovec *vec, int nvec)
   {
       ap_bucket *e;
  @@ -139,7 +139,7 @@
       return vec - orig;
   }
   
  -AP_DECLARE(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
  +APR_DECLARE(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
   {
       ap_bucket *r;
       const char *x;
  @@ -166,7 +166,7 @@
       return k;
   }
   
  -AP_DECLARE_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...)
  +APR_DECLARE_NONSTD(int) ap_brigade_putstrs(ap_bucket_brigade *b, ...)
   {
       va_list va;
       int written;
  @@ -177,7 +177,7 @@
       return written;
   }
   
  -AP_DECLARE_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...)
  +APR_DECLARE_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...)
   {
       va_list ap;
       int res;
  @@ -188,7 +188,7 @@
       return res;
   }
   
  -AP_DECLARE(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va)
  +APR_DECLARE(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va)
   {
       /* XXX:  This needs to be replaced with a function to printf
        * directly into a bucket.  I'm being lazy right now.  RBB
  @@ -231,17 +231,17 @@
       return bucket_types->nelts - 1;
   }
   
  -AP_DECLARE_NONSTD(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data)
  +APR_DECLARE_NONSTD(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data)
   {
       return APR_ENOTIMPL;
   }
   
  -AP_DECLARE_NONSTD(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, apr_off_t point)
  +APR_DECLARE_NONSTD(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, apr_off_t point)
   {
       return APR_ENOTIMPL;
   }
   
  -AP_DECLARE_NONSTD(void) ap_bucket_destroy_notimpl(void *data)
  +APR_DECLARE_NONSTD(void) ap_bucket_destroy_notimpl(void *data)
   {
       return;
   }
  
  
  
  1.14      +2 -3      apr-util/src/buckets/ap_buckets_eos.c
  
  Index: ap_buckets_eos.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_eos.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ap_buckets_eos.c	2000/11/07 20:21:06	1.13
  +++ ap_buckets_eos.c	2000/12/05 01:02:48	1.14
  @@ -52,7 +52,6 @@
    * <http://www.apache.org/>.
    */
   
  -#include "httpd.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -64,7 +63,7 @@
       return APR_SUCCESS;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_make_eos(ap_bucket *b)
  +APR_DECLARE(ap_bucket *) ap_bucket_make_eos(ap_bucket *b)
   {
       b->length    = 0;
       b->data      = NULL;
  @@ -74,7 +73,7 @@
       return b;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_create_eos(void)
  +APR_DECLARE(ap_bucket *) ap_bucket_create_eos(void)
   {
       ap_bucket_do_create(ap_bucket_make_eos(b));
   }
  
  
  
  1.11      +7 -6      apr-util/src/buckets/ap_buckets_file.c
  
  Index: ap_buckets_file.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_file.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ap_buckets_file.c	2000/11/11 04:41:56	1.10
  +++ ap_buckets_file.c	2000/12/05 01:02:48	1.11
  @@ -52,7 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#include "httpd.h"
  +#include "apr_lib.h"
  +#include "apr_file_io.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -115,11 +116,11 @@
       else {
   #endif
   
  -        buf = malloc(IOBUFSIZE);
  +        buf = malloc(HUGE_STRING_LEN);
           *str = buf;
   
  -        if (e->length > IOBUFSIZE) {
  -            *len = IOBUFSIZE;
  +        if (e->length > HUGE_STRING_LEN) {
  +            *len = HUGE_STRING_LEN;
           }
           else {
               *len = e->length;
  @@ -158,7 +159,7 @@
       return APR_SUCCESS;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_make_file(ap_bucket *b, apr_file_t *fd,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_file(ap_bucket *b, apr_file_t *fd,
                                               apr_off_t offset, apr_size_t len)
   {
       ap_bucket_file *f;
  @@ -178,7 +179,7 @@
       return b;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_create_file(apr_file_t *fd,
  +APR_DECLARE(ap_bucket *) ap_bucket_create_file(apr_file_t *fd,
                                                 apr_off_t offset, apr_size_t len)
   {
       ap_bucket_do_create(ap_bucket_make_file(b, fd, offset, len));
  
  
  
  1.6       +2 -3      apr-util/src/buckets/ap_buckets_flush.c
  
  Index: ap_buckets_flush.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_flush.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ap_buckets_flush.c	2000/11/07 20:21:07	1.5
  +++ ap_buckets_flush.c	2000/12/05 01:02:48	1.6
  @@ -52,7 +52,6 @@
    * <http://www.apache.org/>.
    */
   
  -#include "httpd.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -64,7 +63,7 @@
       return APR_SUCCESS;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_make_flush(ap_bucket *b)
  +APR_DECLARE(ap_bucket *) ap_bucket_make_flush(ap_bucket *b)
   {
       b->length    = 0;
       b->data      = NULL;
  @@ -74,7 +73,7 @@
       return b;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_create_flush(void)
  +APR_DECLARE(ap_bucket *) ap_bucket_create_flush(void)
   {
       ap_bucket_do_create(ap_bucket_make_flush(b));
   }
  
  
  
  1.17      +2 -3      apr-util/src/buckets/ap_buckets_heap.c
  
  Index: ap_buckets_heap.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_heap.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ap_buckets_heap.c	2000/11/07 20:21:07	1.16
  +++ ap_buckets_heap.c	2000/12/05 01:02:49	1.17
  @@ -52,7 +52,6 @@
    * <http://www.apache.org/>.
    */
   
  -#include "httpd.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -88,7 +87,7 @@
       free(h);
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
   		const char *buf, apr_size_t length, int copy, apr_size_t *w)
   {
       ap_bucket_heap *h;
  @@ -135,7 +134,7 @@
       return b;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_create_heap(
  +APR_DECLARE(ap_bucket *) ap_bucket_create_heap(
   		const char *buf, apr_size_t length, int copy, apr_size_t *w)
   {
       ap_bucket_do_create(ap_bucket_make_heap(b, buf, length, copy, w));
  
  
  
  1.21      +2 -3      apr-util/src/buckets/ap_buckets_mmap.c
  
  Index: ap_buckets_mmap.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_mmap.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ap_buckets_mmap.c	2000/11/07 20:21:08	1.20
  +++ ap_buckets_mmap.c	2000/12/05 01:02:49	1.21
  @@ -52,7 +52,6 @@
    * <http://www.apache.org/>.
    */
   
  -#include "httpd.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -87,7 +86,7 @@
   /*
    * XXX: are the start and length arguments useful?
    */
  -AP_DECLARE(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
   		apr_mmap_t *mm, apr_off_t start, apr_size_t length)
   {
       ap_bucket_mmap *m;
  @@ -110,7 +109,7 @@
   }
   
   
  -AP_DECLARE(ap_bucket *) ap_bucket_create_mmap(
  +APR_DECLARE(ap_bucket *) ap_bucket_create_mmap(
   		apr_mmap_t *mm, apr_off_t start, apr_size_t length)
   {
       ap_bucket_do_create(ap_bucket_make_mmap(b, mm, start, length));
  
  
  
  1.21      +5 -5      apr-util/src/buckets/ap_buckets_pipe.c
  
  Index: ap_buckets_pipe.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_pipe.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ap_buckets_pipe.c	2000/11/11 04:41:56	1.20
  +++ ap_buckets_pipe.c	2000/12/05 01:02:50	1.21
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "httpd.h"
  +#include "apr_lib.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -71,9 +71,9 @@
           apr_set_pipe_timeout(p, 0);
       }
   
  -    buf = malloc(IOBUFSIZE); /* XXX: check for failure? */
  +    buf = malloc(HUGE_STRING_LEN); /* XXX: check for failure? */
       *str = buf;
  -    *len = IOBUFSIZE;
  +    *len = HUGE_STRING_LEN;
       rv = apr_read(p, buf, len);
   
       if (block == AP_NONBLOCK_READ) {
  @@ -112,7 +112,7 @@
       return APR_SUCCESS;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *p)
  +APR_DECLARE(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *p)
   {
       /*
        * A pipe is closed when the end is reached in pipe_read().  If the
  @@ -134,7 +134,7 @@
       return b;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_create_pipe(apr_file_t *p)
  +APR_DECLARE(ap_bucket *) ap_bucket_create_pipe(apr_file_t *p)
   {
       ap_bucket_do_create(ap_bucket_make_pipe(b, p));
   }
  
  
  
  1.5       +2 -3      apr-util/src/buckets/ap_buckets_pool.c
  
  Index: ap_buckets_pool.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_pool.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ap_buckets_pool.c	2000/11/07 20:21:09	1.4
  +++ ap_buckets_pool.c	2000/12/05 01:02:50	1.5
  @@ -52,7 +52,6 @@
    * <http://www.apache.org/>.
    */
   
  -#include "httpd.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -98,7 +97,7 @@
       free(h);
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_make_pool(ap_bucket *b,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_pool(ap_bucket *b,
   		const char *buf, apr_size_t length, apr_pool_t *p)
   {
       ap_bucket_pool *h;
  @@ -127,7 +126,7 @@
       return b;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_create_pool(
  +APR_DECLARE(ap_bucket *) ap_bucket_create_pool(
   		const char *buf, apr_size_t length, apr_pool_t *p)
   {
       ap_bucket_do_create(ap_bucket_make_pool(b, buf, length, p));
  
  
  
  1.8       +3 -3      apr-util/src/buckets/ap_buckets_refcount.c
  
  Index: ap_buckets_refcount.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_refcount.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ap_buckets_refcount.c	2000/10/16 06:04:29	1.7
  +++ ap_buckets_refcount.c	2000/12/05 01:02:50	1.8
  @@ -58,7 +58,7 @@
   
   #include "ap_buckets.h"
   
  -AP_DECLARE_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *a, apr_off_t point)
  +APR_DECLARE_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *a, apr_off_t point)
   {
       ap_bucket *b;
       ap_bucket_shared *ad, *bd;
  @@ -95,7 +95,7 @@
       return APR_SUCCESS;
   }
   
  -AP_DECLARE(void *) ap_bucket_destroy_shared(void *data)
  +APR_DECLARE(void *) ap_bucket_destroy_shared(void *data)
   {
       ap_bucket_shared *s = data;
       ap_bucket_refcount *r = s->data;
  @@ -110,7 +110,7 @@
       }
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
   					      apr_off_t start, apr_off_t end)
   {
       ap_bucket_shared *s;
  
  
  
  1.14      +4 -5      apr-util/src/buckets/ap_buckets_simple.c
  
  Index: ap_buckets_simple.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_simple.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ap_buckets_simple.c	2000/11/11 04:41:56	1.13
  +++ ap_buckets_simple.c	2000/12/05 01:02:50	1.14
  @@ -52,7 +52,6 @@
    * <http://www.apache.org/>.
    */
   
  -#include "httpd.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -102,7 +101,7 @@
       return APR_SUCCESS;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
   		const char *buf, apr_size_t length)
   {
       ap_bucket_simple *bd;
  @@ -122,7 +121,7 @@
       return b;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_create_immortal(
  +APR_DECLARE(ap_bucket *) ap_bucket_create_immortal(
   		const char *buf, apr_size_t length)
   {
       ap_bucket_do_create(ap_bucket_make_immortal(b, buf, length));
  @@ -155,7 +154,7 @@
       return APR_SUCCESS;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
  +APR_DECLARE(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
   		const char *buf, apr_size_t length)
   {
       b = ap_bucket_make_immortal(b, buf, length);
  @@ -166,7 +165,7 @@
       return b;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_create_transient(
  +APR_DECLARE(ap_bucket *) ap_bucket_create_transient(
   		const char *buf, apr_size_t length)
   {
       ap_bucket_do_create(ap_bucket_make_transient(b, buf, length));
  
  
  
  1.10      +5 -5      apr-util/src/buckets/ap_buckets_socket.c
  
  Index: ap_buckets_socket.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/ap_buckets_socket.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ap_buckets_socket.c	2000/11/11 04:41:56	1.9
  +++ ap_buckets_socket.c	2000/12/05 01:02:51	1.10
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "httpd.h"
  +#include "apr_lib.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -71,9 +71,9 @@
           apr_setsocketopt(p, APR_SO_TIMEOUT, 0);
       }
   
  -    buf = malloc(IOBUFSIZE); /* XXX: check for failure? */
  +    buf = malloc(HUGE_STRING_LEN); /* XXX: check for failure? */
       *str = buf;
  -    *len = IOBUFSIZE;
  +    *len = HUGE_STRING_LEN;
       rv = apr_recv(p, buf, len);
   
       if (block == AP_NONBLOCK_READ) {
  @@ -112,7 +112,7 @@
       return APR_SUCCESS;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *p)
  +APR_DECLARE(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *p)
   {
       /*
        * XXX: We rely on a cleanup on some pool or other to actually
  @@ -129,7 +129,7 @@
       return b;
   }
   
  -AP_DECLARE(ap_bucket *) ap_bucket_create_socket(apr_socket_t *p)
  +APR_DECLARE(ap_bucket *) ap_bucket_create_socket(apr_socket_t *p)
   {
       ap_bucket_do_create(ap_bucket_make_socket(b, p));
   }
  
  
  

Mime
View raw message