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/include ap_buckets.h
Date Sun, 13 Aug 2000 01:01:13 GMT
rbb         00/08/12 18:01:13

  Modified:    src/ap   ap_buckets.c ap_buckets_eos.c ap_buckets_heap.c
                        ap_buckets_mmap.c ap_buckets_transient.c
               src/include ap_buckets.h
  Log:
  These functions are no longer in APR, so they need to use API_EXPORT
  instead of APR_EXPORT.
  
  Revision  Changes    Path
  1.3       +10 -9     apache-2.0/src/ap/ap_buckets.c
  
  Index: ap_buckets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ap_buckets.c	2000/08/13 00:53:41	1.2
  +++ ap_buckets.c	2000/08/13 01:01:11	1.3
  @@ -55,6 +55,7 @@
    *
    */
   
  +#include "httpd.h"
   #include "apr_private.h"
   #include "apr_pools.h"
   #include "apr_lib.h"
  @@ -63,7 +64,7 @@
   #include <sys/uio.h>
   #include "ap_buckets.h"
   
  -APR_EXPORT(apr_status_t) ap_bucket_destroy(ap_bucket *e)
  +API_EXPORT(apr_status_t) ap_bucket_destroy(ap_bucket *e)
   {
       if (e->destroy) {
           e->destroy(e);
  @@ -85,7 +86,7 @@
       return APR_SUCCESS;
   }
   
  -APR_EXPORT(apr_status_t) ap_brigade_destroy(void *data)
  +API_EXPORT(apr_status_t) ap_brigade_destroy(void *data)
   {
       ap_bucket_brigade *b = data;
   
  @@ -98,7 +99,7 @@
       return APR_SUCCESS;
   }
   
  -APR_EXPORT(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p)
  +API_EXPORT(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p)
   {
       ap_bucket_brigade *b;
   
  @@ -111,7 +112,7 @@
       return b;
   }
   
  -APR_EXPORT(void) ap_brigade_append_buckets(ap_bucket_brigade *b, 
  +API_EXPORT(void) ap_brigade_append_buckets(ap_bucket_brigade *b, 
                                                     ap_bucket *e)
   {
       ap_bucket *cur = e;
  @@ -129,7 +130,7 @@
       }
   }
   
  -APR_EXPORT(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
  +API_EXPORT(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
                                              struct iovec *vec, int nvec)
   {
       ap_bucket *e;
  @@ -146,7 +147,7 @@
       return vec - orig;
   }
   
  -APR_EXPORT(void) ap_brigade_catenate(ap_bucket_brigade *a, 
  +API_EXPORT(void) ap_brigade_catenate(ap_bucket_brigade *a, 
                                               ap_bucket_brigade *b)
   {
       if (b->head) {
  @@ -163,7 +164,7 @@
       }
   }
   
  -APR_EXPORT(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
  +API_EXPORT(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
   {
       ap_bucket *r;
       const char *x;
  @@ -189,7 +190,7 @@
       return k;
   }
   
  -APR_EXPORT(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...)
  +API_EXPORT(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...)
   {
       va_list ap;
       int res;
  @@ -200,7 +201,7 @@
       return res;
   }
   
  -APR_EXPORT(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va)
  +API_EXPORT(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va)
   {
       /* THIS IS A HACK.  This needs to be replaced with a function to printf
        * directly into a bucket.  I'm being lazy right now.  RBB
  
  
  
  1.2       +2 -1      apache-2.0/src/ap/ap_buckets_eos.c
  
  Index: ap_buckets_eos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_eos.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ap_buckets_eos.c	2000/08/12 18:45:25	1.1
  +++ ap_buckets_eos.c	2000/08/13 01:01:11	1.2
  @@ -56,6 +56,7 @@
    */
   
   #include "apr_private.h"
  +#include "httpd.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -67,7 +68,7 @@
       return AP_END_OF_BRIGADE;
   }
   
  -APR_EXPORT(ap_bucket *) ap_bucket_eos_create(void)
  +API_EXPORT(ap_bucket *) ap_bucket_eos_create(void)
   {
       ap_bucket *newbuf;
   
  
  
  
  1.2       +2 -1      apache-2.0/src/ap/ap_buckets_heap.c
  
  Index: ap_buckets_heap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_heap.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ap_buckets_heap.c	2000/08/12 18:45:25	1.1
  +++ ap_buckets_heap.c	2000/08/13 01:01:11	1.2
  @@ -56,6 +56,7 @@
    */
   
   #include "apr_private.h"
  +#include "httpd.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -159,7 +160,7 @@
       e->destroy    = heap_destroy;
   }
   
  -APR_EXPORT(ap_bucket *) ap_bucket_heap_create(const void *buf,
  +API_EXPORT(ap_bucket *) ap_bucket_heap_create(const void *buf,
                                   apr_size_t nbyte, apr_ssize_t *w)
   {
       ap_bucket *newbuf;
  
  
  
  1.2       +2 -1      apache-2.0/src/ap/ap_buckets_mmap.c
  
  Index: ap_buckets_mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_mmap.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ap_buckets_mmap.c	2000/08/12 18:45:25	1.1
  +++ ap_buckets_mmap.c	2000/08/13 01:01:11	1.2
  @@ -56,6 +56,7 @@
    */
   
   #include "apr_private.h"
  +#include "httpd.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -105,7 +106,7 @@
       return APR_SUCCESS;
   }
   
  -APR_EXPORT(ap_bucket *) ap_bucket_mmap_create(const apr_mmap_t *buf, 
  +API_EXPORT(ap_bucket *) ap_bucket_mmap_create(const apr_mmap_t *buf, 
                                         apr_size_t nbytes, apr_ssize_t *w)
   {
       ap_bucket *newbuf;
  
  
  
  1.3       +2 -1      apache-2.0/src/ap/ap_buckets_transient.c
  
  Index: ap_buckets_transient.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_transient.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ap_buckets_transient.c	2000/08/13 00:53:42	1.2
  +++ ap_buckets_transient.c	2000/08/13 01:01:11	1.3
  @@ -56,6 +56,7 @@
    */
   
   #include "apr_private.h"
  +#include "httpd.h"
   #include "ap_buckets.h"
   #include <stdlib.h>
   
  @@ -125,7 +126,7 @@
       return APR_SUCCESS;
   }
   
  -APR_EXPORT(ap_bucket *) ap_bucket_transient_create(const void *buf,
  +API_EXPORT(ap_bucket *) ap_bucket_transient_create(const void *buf,
                                  apr_size_t nbyte, apr_ssize_t *w)
   {
       ap_bucket *newbuf;
  
  
  
  1.3       +15 -14    apache-2.0/src/include/ap_buckets.h
  
  Index: ap_buckets.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_buckets.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ap_buckets.h	2000/08/13 00:53:43	1.2
  +++ ap_buckets.h	2000/08/13 01:01:13	1.3
  @@ -55,6 +55,7 @@
   #ifndef AP_BUF_H
   #define AP_BUF_H
   
  +#include "httpd.h"
   #include "apr_general.h"
   #include "apr_mmap.h"
   #include "apr_errno.h"
  @@ -291,7 +292,7 @@
    * @return The empty bucket brigade
    * @deffunc ap_bucket_brigade *ap_brigade_create(apr_pool_t *p)
    */
  -APR_EXPORT(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p);
  +API_EXPORT(ap_bucket_brigade *) ap_brigade_create(apr_pool_t *p);
   
   /**
    * destroy an enitre bucket brigade.  This includes destroying all of the
  @@ -299,7 +300,7 @@
    * @param b The bucket brigade to destroy
    * @deffunc apr_status_t ap_brigade_destroy(void *b)
    */
  -APR_EXPORT(apr_status_t) ap_brigade_destroy(void *b);
  +API_EXPORT(apr_status_t) ap_brigade_destroy(void *b);
   
   /**
    * append bucket(s) to a bucket_brigade.  This is the correct way to add
  @@ -309,7 +310,7 @@
    * @param e The bucket list to append
    * @deffunc void ap_brigade_append_buckets(ap_bucket_brigade *b, ap_bucket *e)
    */
  -APR_EXPORT(void) ap_brigade_append_buckets(ap_bucket_brigade *b,
  +API_EXPORT(void) ap_brigade_append_buckets(ap_bucket_brigade *b,
                                                     ap_bucket *e);
   
   /**
  @@ -319,7 +320,7 @@
    * @param nbytes The number of bytes to consume
    * @deffunc void ap_brigade_consume(ap_bucket_brigade *b, int nbytes)
    */
  -APR_EXPORT(void) ap_brigade_consume(ap_bucket_brigade *b, int nbytes);
  +API_EXPORT(void) ap_brigade_consume(ap_bucket_brigade *b, int nbytes);
   
   /**
    * create an iovec of the elements in a bucket_brigade... return number 
  @@ -331,7 +332,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);
    */
  -APR_EXPORT(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
  +API_EXPORT(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
                                              struct iovec *vec, int nvec);
   
   /**
  @@ -342,7 +343,7 @@
    * @param b The brigade to add to a.  This brigade will be empty on return
    * @deffunc void ap_brigade_catenate(ap_bucket_brigade *a, ap_bucket_brigade *b)
    */
  -APR_EXPORT(void) ap_brigade_catenate(ap_bucket_brigade *a, 
  +API_EXPORT(void) ap_brigade_catenate(ap_bucket_brigade *a, 
                                               ap_bucket_brigade *b);
   
   /**
  @@ -355,7 +356,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_vputstrs(ap_bucket_brigade *b, ava_list va)
    */
  -APR_EXPORT(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va);
  +API_EXPORT(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va);
   
   /**
    * Evaaluate a printf and put the resulting string into a bucket at the end 
  @@ -366,7 +367,7 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...) 
    */
  -APR_EXPORT(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...);
  +API_EXPORT(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...);
   
   /**
    * Evaaluate a printf and put the resulting string into a bucket at the end 
  @@ -377,7 +378,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) 
    */
  -APR_EXPORT(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va);
  +API_EXPORT(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va);
   
   /*   ******  Bucket Functions  *****  */
   
  @@ -390,7 +391,7 @@
    * @param e The bucket to destroy
    * @deffunc apr_status_t ap_bucket_destroy(ap_bucket *e)
    */
  -APR_EXPORT(apr_status_t) ap_bucket_destroy(ap_bucket *e);
  +API_EXPORT(apr_status_t) ap_bucket_destroy(ap_bucket *e);
   
   /****** Functions to Create Buckets of varying type ******/
   
  @@ -414,7 +415,7 @@
    * @return The new bucket
    * @deffunc ap_bucket *ap_bucket_heap_create(const void *buf, apr_size_t nbyte, apr_ssize_t
*w)
    */
  -APR_EXPORT(ap_bucket *) ap_bucket_heap_create(const void *buf,
  +API_EXPORT(ap_bucket *) ap_bucket_heap_create(const void *buf,
                                   apr_size_t nbyte, apr_ssize_t *w);
   
   
  @@ -426,7 +427,7 @@
    * @return The new bucket
    * @deffunc ap_bucket *ap_bucket_mmap_create(const apr_mmap_t *buf, apr_size_t nbyte, apr_ssize_t
*w)
    */
  -APR_EXPORT(ap_bucket *) ap_bucket_mmap_create(const apr_mmap_t *buf,
  +API_EXPORT(ap_bucket *) ap_bucket_mmap_create(const apr_mmap_t *buf,
                                         apr_size_t nbytes, apr_ssize_t *w);
   
   /**
  @@ -437,7 +438,7 @@
    * @return The new bucket
    * @deffunc ap_bucket *ap_bucket_transient_create(const void *buf, apr_size_t nbyte, apr_ssize_t
*w)
    */
  -APR_EXPORT(ap_bucket *) ap_bucket_transient_create(const void *buf,
  +API_EXPORT(ap_bucket *) ap_bucket_transient_create(const void *buf,
                                  apr_size_t nbyte, apr_ssize_t *w);
   
   /**
  @@ -446,7 +447,7 @@
    * @return The new bucket
    * @deffunc ap_bucket *ap_bucket_eos_create(void)
    */
  -APR_EXPORT(ap_bucket *) ap_bucket_eos_create(void);
  +API_EXPORT(ap_bucket *) ap_bucket_eos_create(void);
   
   #endif
   
  
  
  

Mime
View raw message