apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr-util/misc/win32 libaprutil.c
Date Thu, 18 Jan 2001 23:31:00 GMT
wrowe       01/01/18 15:31:00

  Modified:    .        aprutil.dsp libaprutil.dsp
               buckets  ap_buckets.c
               dbm      apr_dbm.c
               include  ap_base64.h ap_buckets.h ap_hooks.h ap_sha1.h
                        apr_dbm.h
  Removed:     .        libaprutil.def
               misc/win32 libaprutil.c
  Log:
    The APU_DECLARE's finished (nearly) for apr-util.  This change also
    jettisons the .def file, and compiles aprutil.lib and libaprutil.dll
    seperately, from source, with appropriate tags.  As with apr, all
    source file changes must be kept in sync between the .dsp files.
  
  Revision  Changes    Path
  1.15      +3 -3      apr-util/aprutil.dsp
  
  Index: aprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.dsp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- aprutil.dsp	2001/01/18 04:34:44	1.14
  +++ aprutil.dsp	2001/01/18 23:30:52	1.15
  @@ -43,7 +43,7 @@
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
   # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM"
/Fd"LibR\aprutil" /FD /c
  +# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC"
/D "APU_USE_SDBM" /Fd"LibR\aprutil" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -67,8 +67,8 @@
   RSC=rc.exe
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM"
/Fd"LibD\aprutil" /FD /c
  +# ADD BASE CPP /nologo /MDd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /ZI /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC"
/D "APU_USE_SDBM" /Fd"LibD\aprutil" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.7       +218 -4    apr-util/libaprutil.dsp
  
  Index: libaprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/libaprutil.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- libaprutil.dsp	2001/01/18 04:34:44	1.6
  +++ libaprutil.dsp	2001/01/18 23:30:52	1.7
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM"
/Fd"Release\libaprutil" /FD /c
  +# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM"
/Fd"Release\aprutil" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MDd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /ZI /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM"
/Fd"Debug\libaprutil" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM"
/Fd"Debug\aprutil" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  @@ -87,13 +87,227 @@
   
   # Name "libaprutil - Win32 Release"
   # Name "libaprutil - Win32 Debug"
  +# Begin Group "Source Files"
  +
  +# PROP Default_Filter ""
  +# Begin Group "buckets"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_brigade.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_buckets.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_buckets_eos.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_buckets_file.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_buckets_flush.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_buckets_heap.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_buckets_mmap.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_buckets_pipe.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_buckets_pool.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_buckets_refcount.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_buckets_simple.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\buckets\ap_buckets_socket.c
  +# End Source File
  +# End Group
  +# Begin Group "crypto"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\crypto\ap_sha1.c
  +# End Source File
  +# End Group
  +# Begin Group "dbm"
  +
  +# PROP Default_Filter ""
  +# Begin Group "sdbm"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\dbm\sdbm\sdbm.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\dbm\sdbm\sdbm_hash.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\dbm\sdbm\sdbm_lock.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\dbm\sdbm\sdbm_pair.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\dbm\sdbm\sdbm_pair.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\dbm\sdbm\sdbm_private.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\dbm\sdbm\sdbm_tune.h
  +# End Source File
  +# End Group
  +# Begin Source File
  +
  +SOURCE=.\dbm\apr_dbm.c
  +# End Source File
  +# End Group
  +# Begin Group "encoding"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\encoding\ap_base64.c
  +# End Source File
  +# End Group
  +# Begin Group "hooks"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\hooks\ap_hooks.c
  +# End Source File
  +# End Group
  +# Begin Group "uri"
  +
  +# PROP Default_Filter ""
  +# End Group
  +# Begin Group "xml"
  +
  +# PROP Default_Filter ""
  +# End Group
  +# End Group
  +# Begin Group "Generated Headers"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\include\apu.h.in
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\apu.hw
  +
  +!IF  "$(CFG)" == "libaprutil - Win32 Release"
  +
  +# Begin Custom Build
  +InputPath=.\include\apu.hw
  +
  +".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\apu.hw .\include\apu.h > nul 
  +	echo Created apu.h from apu.hw 
  +	
  +# End Custom Build
  +
  +!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
  +
  +# Begin Custom Build
  +InputPath=.\include\apu.hw
  +
  +".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\apu.hw .\include\apu.h > nul 
  +	echo Created apu.h from apu.hw 
  +	
  +# End Custom Build
  +
  +!ENDIF 
  +
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\private\apu_private.hw
  +
  +!IF  "$(CFG)" == "libaprutil - Win32 Release"
  +
  +# Begin Custom Build
  +InputPath=.\include\private\apu_private.hw
  +
  +".\include\private\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\private\apu_private.hw .\include\private\apu_private.h > nul 
  +	echo Created apu_private.h from apu_private.hw 
  +	
  +# End Custom Build
  +
  +!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
  +
  +# Begin Custom Build
  +InputPath=.\include\private\apu_private.hw
  +
  +".\include\private\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\private\apu_private.hw .\include\private\apu_private.h > nul 
  +	echo Created apu_private.h from apu_private.hw 
  +	
  +# End Custom Build
  +
  +!ENDIF 
  +
  +# End Source File
  +# End Group
  +# Begin Group "External Headers"
  +
  +# PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\include\ap_base64.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_buckets.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_hooks.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_ring.h
  +# End Source File
   # Begin Source File
   
  -SOURCE=.\misc\win32\libaprutil.c
  +SOURCE=.\include\ap_sha1.h
   # End Source File
   # Begin Source File
   
  -SOURCE=.\libaprutil.def
  +SOURCE=.\include\apr_dbm.h
   # End Source File
  +# End Group
   # End Target
   # End Project
  
  
  
  1.43      +1 -1      apr-util/buckets/ap_buckets.c
  
  Index: ap_buckets.c
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/ap_buckets.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- ap_buckets.c	2001/01/17 04:25:21	1.42
  +++ ap_buckets.c	2001/01/18 23:30:54	1.43
  @@ -70,7 +70,7 @@
   
   static apr_array_header_t *bucket_types;
   
  -void ap_init_bucket_types(apr_pool_t *p)
  +APU_DECLARE(void) ap_init_bucket_types(apr_pool_t *p)
   {
       bucket_types = apr_make_array(p, 8, sizeof(ap_bucket_type));
   
  
  
  
  1.12      +14 -11    apr-util/dbm/apr_dbm.c
  
  Index: apr_dbm.c
  ===================================================================
  RCS file: /home/cvs/apr-util/dbm/apr_dbm.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_dbm.c	2000/12/12 08:54:27	1.11
  +++ apr_dbm.c	2001/01/18 23:30:55	1.12
  @@ -183,8 +183,8 @@
       return rv;
   }
   
  -apr_status_t apr_dbm_open(apr_dbm_t **pdb, const char *pathname, int mode,
  -                          apr_pool_t *pool)
  +APU_DECLARE(apr_status_t) apr_dbm_open(apr_dbm_t **pdb, const char *pathname, 
  +                                       int mode, apr_pool_t *pool)
   {
       real_file_t file;
       int dbmode;
  @@ -230,12 +230,13 @@
       return APR_SUCCESS;
   }
   
  -void apr_dbm_close(apr_dbm_t *db)
  +APU_DECLARE(void) apr_dbm_close(apr_dbm_t *db)
   {
       APR_DBM_CLOSE(db->file);
   }
   
  -apr_status_t apr_dbm_fetch(apr_dbm_t *db, apr_datum_t key, apr_datum_t *pvalue)
  +APU_DECLARE(apr_status_t) apr_dbm_fetch(apr_dbm_t *db, apr_datum_t key,
  +                                        apr_datum_t *pvalue)
   {
       *(real_datum_t *) pvalue = APR_DBM_FETCH(db->file, A2R_DATUM(key));
   
  @@ -246,7 +247,8 @@
       return set_error(db);
   }
   
  -apr_status_t apr_dbm_store(apr_dbm_t *db, apr_datum_t key, apr_datum_t value)
  +APU_DECLARE(apr_status_t) apr_dbm_store(apr_dbm_t *db, apr_datum_t key,
  +                                        apr_datum_t value)
   {
       apr_status_t rv;
   
  @@ -261,7 +263,7 @@
       return rv;
   }
   
  -apr_status_t apr_dbm_delete(apr_dbm_t *db, apr_datum_t key)
  +APU_DECLARE(apr_status_t) apr_dbm_delete(apr_dbm_t *db, apr_datum_t key)
   {
       apr_status_t rv;
   
  @@ -276,7 +278,7 @@
       return rv;
   }
   
  -int apr_dbm_exists(apr_dbm_t *db, apr_datum_t key)
  +APU_DECLARE(int) apr_dbm_exists(apr_dbm_t *db, apr_datum_t key)
   {
       int exists;
   
  @@ -292,7 +294,7 @@
       return exists;
   }
   
  -apr_status_t apr_dbm_firstkey(apr_dbm_t *db, apr_datum_t *pkey)
  +APU_DECLARE(apr_status_t) apr_dbm_firstkey(apr_dbm_t *db, apr_datum_t *pkey)
   {
       *(real_datum_t *) pkey = APR_DBM_FIRSTKEY(db->file);
   
  @@ -303,7 +305,7 @@
       return set_error(db);
   }
   
  -apr_status_t apr_dbm_nextkey(apr_dbm_t *db, apr_datum_t *pkey)
  +APU_DECLARE(apr_status_t) apr_dbm_nextkey(apr_dbm_t *db, apr_datum_t *pkey)
   {
       *(real_datum_t *) pkey = APR_DBM_NEXTKEY(db->file, A2R_DATUM(*pkey));
   
  @@ -314,7 +316,7 @@
       return set_error(db);
   }
   
  -void apr_dbm_freedatum(apr_dbm_t *db, apr_datum_t data)
  +APU_DECLARE(void) apr_dbm_freedatum(apr_dbm_t *db, apr_datum_t data)
   {
   #ifdef NEEDS_CLEANUP
       (void) apr_run_cleanup(db->pool, data.dptr, datum_cleanup);
  @@ -326,7 +328,8 @@
   /* XXX: This is wrong... need to return a canonical errcode as part
    * of this package, and follow the apr_dso_error prototype.
    */
  -void apr_dbm_geterror(apr_dbm_t *db, int *errcode, const char **errmsg)
  +APU_DECLARE(void) apr_dbm_geterror(apr_dbm_t *db, int *errcode, 
  +                                   const char **errmsg)
   {
       *errcode = db->errcode;
       *errmsg = db->errmsg;
  
  
  
  1.12      +7 -3      apr-util/include/ap_base64.h
  
  Index: ap_base64.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/ap_base64.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ap_base64.h	2000/12/21 18:06:13	1.11
  +++ ap_base64.h	2001/01/18 23:30:56	1.12
  @@ -100,7 +100,8 @@
    * @return the length of the encoded string
    * @deffunc int ap_base64encode(char *coded_dst, const char *plain_src, int len_plain_src)
    */ 
  -APU_DECLARE(int) ap_base64encode(char * coded_dst, const char *plain_src,int len_plain_src);
  +APU_DECLARE(int) ap_base64encode(char * coded_dst, const char *plain_src, 
  +                                 int len_plain_src);
   
   /**
    * Encode an EBCDIC string using base64encoding.
  @@ -110,7 +111,9 @@
    * @return the length of the encoded string
    * @deffunc int ap_base64encode_binary(char *coded_dst, const char *plain_src, int len_plain_src)
    */ 
  -APU_DECLARE(int) ap_base64encode_binary(char * coded_dst, const unsigned char *plain_src,int
len_plain_src);
  +APU_DECLARE(int) ap_base64encode_binary(char * coded_dst, 
  +                                        const unsigned char *plain_src,
  +                                        int len_plain_src);
   
   /**
    * Determine the length of a plain text string given the encoded version
  @@ -136,7 +139,8 @@
    * @return the length of the plain text string
    * @deffunc int ap_base64decode_binary(char *plain_dst, const char *coded_src)
    */ 
  -APU_DECLARE(int) ap_base64decode_binary(unsigned char * plain_dst, const char *coded_src);
  +APU_DECLARE(int) ap_base64decode_binary(unsigned char * plain_dst, 
  +                                        const char *coded_src);
   
   #ifdef __cplusplus
   }
  
  
  
  1.63      +78 -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.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- ap_buckets.h	2000/12/31 12:12:56	1.62
  +++ ap_buckets.h	2001/01/18 23:30:56	1.63
  @@ -70,6 +70,10 @@
   #include <stdarg.h>
   #endif
   
  +#ifdef __cplusplus
  +extern "C" {
  +#endif
  +
   /**
    * @package Bucket Brigades
    */
  @@ -582,7 +586,7 @@
    * @deffunc ap_bucket_brigade *ap_brigade_split(ap_bucket_brigade *b, ap_bucket *e)
    */
   APU_DECLARE(ap_bucket_brigade *) ap_brigade_split(ap_bucket_brigade *b,
  -						 ap_bucket *e);
  +						  ap_bucket *e);
   
   /**
    * Partition a bucket brigade at a given offset (in bytes from the start of
  @@ -618,7 +622,7 @@
    * @deffunc int ap_brigade_to_iovec(ap_bucket_brigade *b, struct iovec *vec, int nvec);
    */
   APU_DECLARE(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
  -				    struct iovec *vec, int nvec);
  +				     struct iovec *vec, int nvec);
   
   /**
    * This function writes a list of strings into a bucket brigade.  We just 
  @@ -649,7 +653,8 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...) 
    */
  -APU_DECLARE_NONSTD(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...);
  +APU_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 
  @@ -660,7 +665,8 @@
    * @return The number of bytes added to the brigade
    * @deffunc int ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va) 
    */
  -APU_DECLARE(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va);
  +APU_DECLARE(int) ap_brigade_vprintf(ap_bucket_brigade *b, 
  +                                    const char *fmt, va_list va);
   
   
   /*  *****  Bucket Functions  *****  */
  @@ -670,7 +676,7 @@
    * @param p The pool to allocate the array out of.
    * @deffunc void ap_init_bucket_types(apr_pool_t *p)
    */
  -void ap_init_bucket_types(apr_pool_t *p);
  +APU_DECLARE(void) ap_init_bucket_types(apr_pool_t *p);
   
   /**
    * free the resources used by a bucket. If multiple buckets refer to
  @@ -728,16 +734,19 @@
    * @deffunc apr_status_t ap_bucket_setaside_notimpl(ap_bucket *data)
    */ 
   APU_DECLARE_NONSTD(apr_status_t) ap_bucket_setaside_notimpl(ap_bucket *data);
  +
   /**
    * A place holder function that signifies that the split function was not
    * implemented for this bucket
    * @param data The bucket to split
    * @param point The location to split the bucket
    * @return APR_ENOTIMPL
  - * @deffunc apr_status_t ap_bucket_split_notimpl(ap_bucket *data)
  + * @deffunc apr_status_t ap_bucket_split_notimpl(ap_bucket *data, apr_off_t point)
    */ 
  -APU_DECLARE_NONSTD(apr_status_t) ap_bucket_split_notimpl(ap_bucket *data, 
  -                                                 apr_off_t point);
  +APU_DECLARE_NONSTD(apr_status_t) 
  +                       ap_bucket_split_notimpl(ap_bucket *data, 
  +                                               apr_off_t point);
  +
   /**
    * A place holder function that signifies that the copy function was not
    * implemented for this bucket
  @@ -746,8 +755,9 @@
    * @return APR_ENOTIMPL
    * @deffunc apr_status_t ap_bucket_copy_notimpl(ap_bucket *e, ap_bucket **c)
    */
  -APU_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_notimpl(ap_bucket *e,
  -                                                        ap_bucket **c);
  +APU_DECLARE_NONSTD(apr_status_t) 
  +                       ap_bucket_copy_notimpl(ap_bucket *e, ap_bucket **c);
  +
   /**
    * A place holder function that signifies that the destroy function was not
    * implemented for this bucket
  @@ -755,6 +765,7 @@
    * @deffunc void ap_bucket_destroy(ap_bucket *data)
    */ 
   APU_DECLARE_NONSTD(void) ap_bucket_destroy_notimpl(void *data);
  +
   /* There is no ap_bucket_read_notimpl, because it is a required function
    */
   
  @@ -817,7 +828,6 @@
    */
   APU_DECLARE_DATA extern const ap_bucket_type ap_socket_type;
   
  -
   /*  *****  Shared reference-counted buckets  *****  */
   
   /**
  @@ -837,8 +847,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_shared(ap_bucket_refcount *r, apr_off_t start, apr_off_t
end) 
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_make_shared(ap_bucket *b, void *data,
  -					      apr_off_t start, apr_off_t end);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_make_shared(ap_bucket *b, void *data,
  +				      apr_off_t start, apr_off_t end);
   
   /**
    * Decrement the refcount of the data in the bucket and free the
  @@ -864,7 +875,8 @@
    *         or APR_SUCCESS
    * @deffunc apr_status_t ap_bucket_split_shared(ap_bucket *b, apr_off_t point)
    */
  -APU_DECLARE_NONSTD(apr_status_t) ap_bucket_split_shared(ap_bucket *b, apr_off_t point);
  +APU_DECLARE_NONSTD(apr_status_t) 
  +                       ap_bucket_split_shared(ap_bucket *b, apr_off_t point);
   
   /**
    * Copy a refcounted bucket, incrementing the reference count. Most
  @@ -876,7 +888,8 @@
              or APR_SUCCESS
    * @deffunc apr_status_t ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c)
    */
  -APU_DECLARE_NONSTD(apr_status_t) ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c);
  +APU_DECLARE_NONSTD(apr_status_t) 
  +                       ap_bucket_copy_shared(ap_bucket *a, ap_bucket **c);
   
   
   /*  *****  Functions to Create Buckets of varying type  *****  */
  @@ -910,7 +923,6 @@
   	return ap__b;				\
       } while(0)
   
  -
   /**
    * Create an End of Stream bucket.  This indicates that there is no more data
    * coming from down the filter stack.  All filters should flush at this point.
  @@ -918,6 +930,7 @@
    * @deffunc ap_bucket *ap_bucket_create_eos(void)
    */
   APU_DECLARE(ap_bucket *) ap_bucket_create_eos(void);
  +
   /**
    * Make the bucket passed in an EOS bucket.  This indicates that there is no 
    * more data coming from down the filter stack.  All filters should flush at 
  @@ -936,6 +949,7 @@
    * @deffunc ap_bucket *ap_bucket_create_flush(void)
    */
   APU_DECLARE(ap_bucket *) ap_bucket_create_flush(void);
  +
   /**
    * Make the bucket passed in a FLUSH  bucket.  This indicates that filters 
    * should flush their data.  There is no guarantee that they will flush it, 
  @@ -953,8 +967,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_immortal(const char *buf, apr_size_t nbyte, apr_size_t
*w)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_create_immortal(
  -		const char *buf, apr_size_t nbyte);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_create_immortal(const char *buf, apr_size_t nbyte);
  +
   /**
    * Make the bucket passed in a bucket refer to long-lived data
    * @param b The bucket to make into a IMMORTAL bucket
  @@ -964,8 +979,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_immortal(ap_bucket *b, const char *buf, apr_size_t
nbyte, apr_size_t *w)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
  -		const char *buf, apr_size_t nbyte);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_make_immortal(ap_bucket *b, const char *buf, 
  +                                        apr_size_t nbyte);
   
   /**
    * Create a bucket referring to data on the stack.
  @@ -974,8 +990,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)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_create_transient(
  -		const char *buf, apr_size_t nbyte);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_create_transient(const char *buf, apr_size_t nbyte);
  +
   /**
    * Make the bucket passed in a bucket refer to stack data
    * @param b The bucket to make into a TRANSIENT bucket
  @@ -984,8 +1001,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_transient(ap_bucket *b, const char *buf, apr_size_t
nbyte)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
  -		const char *buf, apr_size_t nbyte);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_make_transient(ap_bucket *b, const char *buf,
  +                                         apr_size_t nbyte);
   
   /**
    * Create a bucket referring to memory on the heap. If the caller asks
  @@ -1002,8 +1020,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)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_create_heap(
  -		const char *buf, apr_size_t nbyte, int copy, apr_size_t *w);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_create_heap(const char *buf, apr_size_t nbyte, 
  +                                      int copy, apr_size_t *w);
   /**
    * Make the bucket passed in a bucket refer to heap data
    * @param b The bucket to make into a HEAP bucket
  @@ -1015,8 +1034,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_heap(ap_bucket *b, const char *buf, apr_size_t nbyte,
int copy, apr_size_t *w)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
  -		const char *buf, apr_size_t nbyte, int copy, apr_size_t *w);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_make_heap(ap_bucket *b, const char *buf,
  +                                    apr_size_t nbyte, int copy, apr_size_t *w);
   
   /**
    * Create a bucket referring to memory allocated out of a pool.
  @@ -1025,8 +1045,10 @@
    * @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)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_create_pool(const char *buf,  
  -                                            apr_size_t length, apr_pool_t *p);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_create_pool(const char *buf, apr_size_t length,
  +                                      apr_pool_t *p);
  +
   /**
    * Make the bucket passed in a bucket refer to pool data
    * @param b The bucket to make into a pool bucket
  @@ -1035,8 +1057,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_pool(ap_bucket *b, const char *buf, apr_size_t *length,
apr_pool_t *p)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_make_pool(ap_bucket *b,
  -		const char *buf, apr_size_t length, apr_pool_t *p);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_make_pool(ap_bucket *b, const char *buf, 
  +                                    apr_size_t length, apr_pool_t *p);
   
   /**
    * Create a bucket referring to mmap()ed memory.
  @@ -1047,8 +1070,10 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_mmap(const apr_mmap_t *mm, apr_size_t start, apr_size_t
length)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_create_mmap(
  -		apr_mmap_t *mm, apr_off_t start, apr_size_t length);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_create_mmap(apr_mmap_t *mm, apr_off_t start,
  +                                      apr_size_t length);
  +
   /**
    * Make the bucket passed in a bucket refer to an MMAP'ed file
    * @param b The bucket to make into a MMAP bucket
  @@ -1059,8 +1084,9 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_mmap(ap_bucket *b, const apr_mmap_t *mm, apr_size_t
start, apr_size_t length)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_make_mmap(ap_bucket *b,
  -		apr_mmap_t *mm, apr_off_t start, apr_size_t length);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_make_mmap(ap_bucket *b, apr_mmap_t *mm, 
  +                                    apr_off_t start, apr_size_t length);
   
   /**
    * Create a bucket referring to a socket.
  @@ -1076,7 +1102,8 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_socket(ap_bucket *b, apr_socket_t *thissocket)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_make_socket(ap_bucket *b, apr_socket_t *thissock);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_make_socket(ap_bucket *b, apr_socket_t *thissock);
   
   /**
    * Create a bucket referring to a pipe.
  @@ -1085,6 +1112,7 @@
    * @deffunc ap_bucket *ap_bucket_create_pipe(apr_file_t *thispipe)
    */
   APU_DECLARE(ap_bucket *) ap_bucket_create_pipe(apr_file_t *thispipe);
  +
   /**
    * Make the bucket passed in a bucket refer to a pipe
    * @param b The bucket to make into a PIPE bucket
  @@ -1092,7 +1120,8 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_pipe(ap_bucket *b, apr_file_t *thispipe)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_make_pipe(ap_bucket *b, apr_file_t *thispipe);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_make_pipe(ap_bucket *b, apr_file_t *thispipe);
   
   /**
    * Create a bucket referring to a file.
  @@ -1102,7 +1131,10 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_create_file(apr_file_t *fd, apr_off_t offset, apr_size_t
len)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_create_file(apr_file_t *fd, apr_off_t offset, apr_size_t
len);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_create_file(apr_file_t *fd, apr_off_t offset,
  +                                      apr_size_t len);
  +
   /**
    * Make the bucket passed in a bucket refer to a file
    * @param b The bucket to make into a FILE bucket
  @@ -1112,7 +1144,12 @@
    * @return The new bucket, or NULL if allocation failed
    * @deffunc ap_bucket *ap_bucket_make_file(ap_bucket *b, apr_file_t *fd, apr_off_t offset,
apr_size_t len)
    */
  -APU_DECLARE(ap_bucket *) ap_bucket_make_file(ap_bucket *b, apr_file_t *fd, 
  -                                            apr_off_t offset, apr_size_t len);
  +APU_DECLARE(ap_bucket *) 
  +                ap_bucket_make_file(ap_bucket *b, apr_file_t *fd,
  +                                    apr_off_t offset, apr_size_t len);
  +
  +#ifdef __cplusplus
  +}
  +#endif
   
   #endif /* !AP_BUCKETS_H */
  
  
  
  1.33      +10 -2     apr-util/include/ap_hooks.h
  
  Index: ap_hooks.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/ap_hooks.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- ap_hooks.h	2001/01/06 20:43:50	1.32
  +++ ap_hooks.h	2001/01/18 23:30:56	1.33
  @@ -59,6 +59,10 @@
   /* For apr_array_header_t */
   #include "apr_tables.h"
   
  +#ifdef __cplusplus
  +extern "C" {
  +#endif
  +
   /**
    * @package Apache hooks functions
    */
  @@ -235,7 +239,7 @@
    * @deffunc void ap_hook_sort_register(const char *szHookName, ap_arry_header_t **aHooks)
    */
   APU_DECLARE(void) ap_hook_sort_register(const char *szHookName, 
  -                                       apr_array_header_t **aHooks);
  +                                        apr_array_header_t **aHooks);
   /**
    * Sort all of the registerd functions for a given hook
    * @deffunc void ap_sort_hooks(void)
  @@ -251,12 +255,16 @@
    * @deffunc void ap_show_hook(const char *szName, const char *const *aszPre, const char
*const *aszSucc)
    */
   APU_DECLARE(void) ap_show_hook(const char *szName,const char * const *aszPre,
  -                              const char * const *aszSucc);
  +                               const char * const *aszSucc);
   
   /**
    * Remove all currently registered functions.
    * @deffunc void ap_hook_deregister_all(void)
    */
   APU_DECLARE(void) ap_hook_deregister_all(void);
  +
  +#ifdef __cplusplus
  +}
  +#endif
   
   #endif /* ndef(AP_HOOKS_H) */
  
  
  
  1.15      +4 -4      apr-util/include/ap_sha1.h
  
  Index: ap_sha1.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/ap_sha1.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ap_sha1.h	2000/12/21 18:06:13	1.14
  +++ ap_sha1.h	2001/01/18 23:30:57	1.15
  @@ -131,7 +131,7 @@
    * @deffunc void ap_SHA1Update(AP_SHA1_CTX *context, const char *input, unsigned int inputLen)
    */
   APU_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *context, const char *input,
  -                              unsigned int inputLen);
  +                                unsigned int inputLen);
   
   /**
    * Update the SHA digest with binary data
  @@ -141,8 +141,8 @@
    * @deffunc void ap_SHA1Update_binary(AP_SHA1_CTX *context, const unsigned char *input,
unsigned int inputLen)
    */
   APU_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *context,
  -                                     const unsigned char *input,
  -                                     unsigned int inputLen);
  +                                       const unsigned char *input,
  +                                       unsigned int inputLen);
   
   /**
    * Finish computing the SHA digest
  @@ -151,7 +151,7 @@
    * @deffunc void ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE], AP_SHA1_CTX *context)
    */
   APU_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE],
  -                             AP_SHA1_CTX *context);
  +                               AP_SHA1_CTX *context);
   
   #ifdef __cplusplus
   }
  
  
  
  1.6       +27 -14    apr-util/include/apr_dbm.h
  
  Index: apr_dbm.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_dbm.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_dbm.h	2000/12/21 18:06:13	1.5
  +++ apr_dbm.h	2001/01/18 23:30:57	1.6
  @@ -100,70 +100,83 @@
    *           APR_DBM_RWCREATE   open for r/w, create if needed
    * </PRE>
    * @param cntxt The pool to use when creating the dbm
  + * @deffunc apr_status_t apr_dbm_open(apr_dbm_t **dbm, const char *name, int mode
    * @tip The dbm name may not be a true file name, as many dbm packages
    * append suffixes for seperate data and index files.
    */
  -apr_status_t apr_dbm_open(apr_dbm_t **dbm, const char *name, int mode,
  -                          apr_pool_t *cntxt);
  +APU_DECLARE(apr_status_t) apr_dbm_open(apr_dbm_t **dbm, const char *name, 
  +                                       int mode, apr_pool_t *cntxt);
   /**
    * Close a dbm file previously opened by apr_dbm_open
    * @param dbm The database to close
  + * @deffunc void apr_dbm_close(apr_dbm_t *db)
    */
  -void apr_dbm_close(apr_dbm_t *db);
  +APU_DECLARE(void) apr_dbm_close(apr_dbm_t *db);
   /**
    * Fetch a dbm record value by key
    * @param dbm The database 
    * @param key The key datum to find this record
    * @param value The value datum retrieved for this record
  + * @deffunc apr_status_t apr_dbm_fetch(apr_dbm_t *dbm, apr_datum_t key
    */
  -apr_status_t apr_dbm_fetch(apr_dbm_t *dbm, apr_datum_t key,
  -                           apr_datum_t *pvalue);
  +APU_DECLARE(apr_status_t) apr_dbm_fetch(apr_dbm_t *dbm, apr_datum_t key,
  +                                        apr_datum_t *pvalue);
   /**
    * Store a dbm record value by key
    * @param dbm The database 
    * @param key The key datum to store this record by
    * @param value The value datum to store in this record
  + * @deffunc apr_status_t apr_dbm_store(apr_dbm_t *dbm, apr_datum_t key, apr_datum_t value)
    */
  -apr_status_t apr_dbm_store(apr_dbm_t *dbm, apr_datum_t key, apr_datum_t value);
  +APU_DECLARE(apr_status_t) apr_dbm_store(apr_dbm_t *dbm, apr_datum_t key, 
  +                                        apr_datum_t value);
  +
   /**
    * Delete a dbm record value by key
    * @param dbm The database 
    * @param key The key datum of the record to delete
  + * @deffunc apr_status_t apr_dbm_delete(apr_dbm_t *dbm, apr_datum_t key)
    */
  -apr_status_t apr_dbm_delete(apr_dbm_t *dbm, apr_datum_t key);
  +APU_DECLARE(apr_status_t) apr_dbm_delete(apr_dbm_t *dbm, apr_datum_t key);
  +
   /**
    * Search for a key within the dbm
    * @param dbm The database 
    * @param key The datum describing a key to test
  + * @deffunc int apr_dbm_exists(apr_dbm_t *dbm, apr_datum_t key)
    */
  -int apr_dbm_exists(apr_dbm_t *dbm, apr_datum_t key);
  +APU_DECLARE(int) apr_dbm_exists(apr_dbm_t *dbm, apr_datum_t key);
  +
   /**
    * Retrieve the first record key from a dbm
    * @param dbm The database 
    * @param key The key datum of the first record
  + * @deffunc apr_status_t apr_dbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey)
    */
  -apr_status_t apr_dbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey);
  +APU_DECLARE(apr_status_t) apr_dbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey);
  +
   /**
    * Retrieve the next record key from a dbm
    * @param dbm The database 
    * @param key The key datum of the next record
  + * @deffunc apr_status_t apr_dbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
    */
  -apr_status_t apr_dbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey);
  +APU_DECLARE(apr_status_t) apr_dbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey);
   
   /* XXX: This is bogus.  If this is a pool-managed dbm wrapper, we
    * don't free datum.  If it isn't why pass pools? 
  + * @deffunc void apr_dbm_freedatum(apr_dbm_t *dbm, apr_datum_t data)
    */
  -void apr_dbm_freedatum(apr_dbm_t *dbm, apr_datum_t data);
  +APU_DECLARE(void) apr_dbm_freedatum(apr_dbm_t *dbm, apr_datum_t data);
   
   /* XXX: Need to change errcode to be handled canonically, and modify
    * the prototype to follow apr_dso_error etc.
  + * @deffunc void apr_dbm_geterror(apr_dbm_t *dbm, int *errcode, const char **errmsg)
    */
  -void apr_dbm_geterror(apr_dbm_t *dbm, int *errcode, const char **errmsg);
  +APU_DECLARE(void) apr_dbm_geterror(apr_dbm_t *dbm, int *errcode, const char **errmsg);
   
   #ifdef __cplusplus
   }
   #endif
   
   #endif	/* !APR_DBM_H */
  -
  -
  
  
  

Mime
View raw message