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/os/win32 os.h
Date Thu, 08 Jun 2000 19:29:43 GMT
rbb         00/06/08 12:29:41

  Modified:    src      configure.in
               src/include buff.h
               src/lib/apr/include apr_lib.h apr_pools.h
               src/lib/apr/lib apr_tables.c
               src/os/win32 os.h
  Added:       src/lib/apr/include apr_tables.h
  Log:
  Cleanup APR header files a bit.  Basically, this splits ap_table_t related
  functions into their own header file, away from apr_pools.h.  At the same
  time as I was doing this, I removed a couple of definitions that aren't
  used anywhere anymore, like ap_child_info_t.
  
  Revision  Changes    Path
  1.48      +0 -4      apache-2.0/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- configure.in	2000/06/08 00:28:31	1.47
  +++ configure.in	2000/06/08 19:29:37	1.48
  @@ -116,10 +116,6 @@
   AC_CHECK_LIB(socket, socket)
   AC_CHECK_LIB(resolv, sethostent)
   
  -AC_CHECK_FUNCS(inet_addr inet_network, break, [
  -  AC_MSG_ERROR(inet_addr function not found)
  -])
  -
   APACHE_INADDR_NONE
   
   APACHE_EBCDIC
  
  
  
  1.26      +0 -4      apache-2.0/src/include/buff.h
  
  Index: buff.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/buff.h,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- buff.h	2000/06/02 23:35:33	1.25
  +++ buff.h	2000/06/08 19:29:37	1.26
  @@ -312,10 +312,6 @@
    
   #endif /*APACHE_XLATE*/
   
  -API_EXPORT(int) ap_bspawn_child(ap_pool_t *, int (*)(void *, ap_child_info_t *), void *,
  -					enum kill_conditions, BUFF **pipe_in, BUFF **pipe_out,
  -					BUFF **pipe_err);
  -
   #ifdef __cplusplus
   }
   #endif
  
  
  
  1.33      +1 -88     apache-2.0/src/lib/apr/include/apr_lib.h
  
  Index: apr_lib.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- apr_lib.h	2000/05/26 16:23:12	1.32
  +++ apr_lib.h	2000/06/08 19:29:38	1.33
  @@ -56,6 +56,7 @@
   #define APR_LIB_H
   
   #include "apr_general.h"
  +#include "apr_tables.h"
   #include "apr_file_io.h"
   #include "apr_thread_proc.h"
   
  @@ -77,37 +78,6 @@
    */
   
   /*
  - * Memory allocation stuff, like pools, arrays, and tables.  Pools
  - * and tables are opaque structures to applications, but arrays are
  - * published.
  - */
  -typedef struct ap_table_t ap_table_t;
  -typedef struct ap_child_info_t ap_child_info_t;
  -typedef void ap_mutex_t;
  -typedef struct ap_array_header_t {
  -    ap_pool_t *cont;
  -    int elt_size;
  -    int nelts;
  -    int nalloc;
  -    char *elts;
  -} ap_array_header_t;
  -
  -typedef struct ap_table_entry_t {
  -    char *key;          /* maybe NULL in future;
  -                         * check when iterating thru table_elts
  -                         */
  -    char *val;
  -} ap_table_entry_t;
  -
  -/* XXX: these know about the definition of struct ap_table_t in alloc.c.  That
  - * definition is not here because it is supposed to be private, and by not
  - * placing it here we are able to get compile-time diagnostics from modules
  - * written which assume that a ap_table_t is the same as an ap_array_header_t. -djg
  - */
  -#define ap_table_elts(t) ((ap_array_header_t *)(t))
  -#define ap_is_empty_table(t) (((t) == NULL)||(((ap_array_header_t *)(t))->nelts == 0))
  -
  -/*
    * Structure used by the variable-formatter routines.
    */
   typedef struct ap_vformatter_buff_t {
  @@ -139,10 +109,6 @@
   APR_EXPORT_NONSTD(ap_status_t) ap_execve(const char *c, const char *argv[],
   				  const char *envp[]);
   
  -#define ap_create_mutex(x) (0)
  -#define ap_release_mutex(x) (0)
  -#define ap_acquire_mutex(x) (0)
  -
   /* These macros allow correct support of 8-bit characters on systems which
    * support 8-bit characters.  Pretty dumb how the cast is required, but
    * that's legacy libc for ya.  These new macros do not support EOF like
  @@ -162,9 +128,6 @@
   #define ap_tolower(c) (tolower(((unsigned char)(c))))
   #define ap_toupper(c) (toupper(((unsigned char)(c))))
   
  -
  -
  -
   /*
    * Small utility macros to make things easier to read.  Not usually a
    * goal, to be sure..
  @@ -292,50 +255,6 @@
   APR_EXPORT_NONSTD(char *) ap_pstrcat(struct ap_pool_t *p, ...);
   APR_EXPORT(char *) ap_pvsprintf(struct ap_pool_t *p, const char *fmt, va_list ap);
   APR_EXPORT_NONSTD(char *) ap_psprintf(struct ap_pool_t *p, const char *fmt, ...);
  -APR_EXPORT(ap_array_header_t *) ap_make_array(struct ap_pool_t *p, int nelts,
  -						int elt_size);
  -APR_EXPORT(void *) ap_push_array(ap_array_header_t *arr);
  -APR_EXPORT(void) ap_array_cat(ap_array_header_t *dst,
  -			       const ap_array_header_t *src);
  -APR_EXPORT(ap_array_header_t *) ap_copy_array(struct ap_pool_t *p,
  -						const ap_array_header_t *arr);
  -APR_EXPORT(ap_array_header_t *)
  -	ap_copy_array_hdr(struct ap_pool_t *p,
  -			   const ap_array_header_t *arr);
  -APR_EXPORT(ap_array_header_t *)
  -	ap_append_arrays(struct ap_pool_t *p,
  -			  const ap_array_header_t *first,
  -			  const ap_array_header_t *second);
  -APR_EXPORT(char *) ap_array_pstrcat(struct ap_pool_t *p,
  -				     const ap_array_header_t *arr,
  -				     const char sep);
  -APR_EXPORT(ap_table_t *) ap_make_table(struct ap_pool_t *p, int nelts);
  -APR_EXPORT(ap_table_t *) ap_copy_table(struct ap_pool_t *p, const ap_table_t *t);
  -APR_EXPORT(void) ap_clear_table(ap_table_t *t);
  -APR_EXPORT(const char *) ap_table_get(const ap_table_t *t, const char *key);
  -APR_EXPORT(void) ap_table_set(ap_table_t *t, const char *key,
  -			       const char *val);
  -APR_EXPORT(void) ap_table_setn(ap_table_t *t, const char *key,
  -				const char *val);
  -APR_EXPORT(void) ap_table_unset(ap_table_t *t, const char *key);
  -APR_EXPORT(void) ap_table_merge(ap_table_t *t, const char *key,
  -				 const char *val);
  -APR_EXPORT(void) ap_table_mergen(ap_table_t *t, const char *key,
  -				  const char *val);
  -APR_EXPORT(void) ap_table_add(ap_table_t *t, const char *key,
  -			       const char *val);
  -APR_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key,
  -				const char *val);
  -APR_EXPORT(ap_table_t *) ap_overlay_tables(struct ap_pool_t *p,
  -					     const ap_table_t *overlay,
  -					     const ap_table_t *base);
  -APR_EXPORT(void)
  -	ap_table_do(int (*comp) (void *, const char *, const char *),
  -		     void *rec, const ap_table_t *t, ...);
  -#define AP_OVERLAP_TABLES_SET   (0)
  -#define AP_OVERLAP_TABLES_MERGE (1)
  -APR_EXPORT(void) ap_overlap_tables(ap_table_t *a, const ap_table_t *b,
  -				    unsigned flags);
   APR_EXPORT(void) ap_register_cleanup(struct ap_pool_t *p, void *data,
   				      ap_status_t (*plain_cleanup) (void *),
   				      ap_status_t (*child_cleanup) (void *));
  @@ -349,12 +268,6 @@
   
   APR_EXPORT(void) ap_note_subprocess(struct ap_pool_t *a, ap_proc_t *pid,
   				     enum kill_conditions how);
  -APR_EXPORT(int)
  -	ap_spawn_child(ap_pool_t *p,
  -			int (*func) (void *a, ap_child_info_t *c),
  -			void *data, enum kill_conditions kill_how,
  -			FILE **pipe_in, FILE **pipe_out,
  -			FILE **pipe_err);
   
   APR_EXPORT(char *) ap_cpystrn(char *dst, const char *src, size_t dst_size);
   
  
  
  
  1.15      +0 -30     apache-2.0/src/lib/apr/include/apr_pools.h
  
  Index: apr_pools.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_pools.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- apr_pools.h	2000/05/26 16:23:13	1.14
  +++ apr_pools.h	2000/06/08 19:29:38	1.15
  @@ -92,28 +92,6 @@
       struct process_chain *next;
   };
   
  -struct ap_table_t {
  -    /* This has to be first to promote backwards compatibility with
  -     * older modules which cast a ap_table_t * to an ap_array_header_t *...
  -     * they should use the table_elts() function for most of the
  -     * cases they do this for.
  -     */
  -    ap_array_header_t a;
  -#ifdef MAKE_TABLE_PROFILE
  -    void *creator;
  -#endif
  -};
  -
  -/*
  - * Tables.  Implemented alist style, for now, though we try to keep
  - * it so that imposing a hash table structure on top in the future
  - * wouldn't be *too* hard...
  - *
  - * Note that key comparisons for these are case-insensitive, largely
  - * because that's what's appropriate and convenient everywhere they're
  - * currently being used...
  - */
  -
   ap_status_t ap_init_alloc(void);	/* Set up everything */
   void        ap_term_alloc(void);        /* Tear down everything */
   
  @@ -213,14 +191,6 @@
   #endif
   
   
  -
  -/* XXX: these know about the definition of struct ap_table_t in alloc.c.  That
  - * definition is not here because it is supposed to be private, and by not
  - * placing it here we are able to get compile-time diagnostics from modules
  - * written which assume that a ap_table_t is the same as an ap_array_header_t. -djg
  - */
  -#define ap_table_elts(t) ((ap_array_header_t *)(t))
  -#define ap_is_empty_table(t) (((t) == NULL)||(((ap_array_header_t *)(t))->nelts == 0))
   
   /* magic numbers --- min free bytes to consider a free ap_pool_t block useable,
    * and the min amount to allocate if we have to go to malloc() */
  
  
  
  1.1                  apache-2.0/src/lib/apr/include/apr_tables.h
  
  Index: apr_tables.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #ifndef APR_TABLES_H
  #define APR_TABLES_H
  
  #include "apr_general.h"
  #include "apr_file_io.h"
  #include "apr_thread_proc.h"
  
  #if APR_HAVE_STDARG_H
  #include <stdarg.h>
  #endif
  #if APR_HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
  
  #ifdef __cplusplus
  extern "C" {
  #endif /* __cplusplus */
  
  /*
   * Define the structures used by the APR general-purpose library.
   */
  
  /*
   * Memory allocation stuff, like pools, arrays, and tables.  Pools
   * and tables are opaque structures to applications, but arrays are
   * published.
   */
  typedef struct ap_table_t ap_table_t;
  typedef struct ap_array_header_t {
      ap_pool_t *cont;
      int elt_size;
      int nelts;
      int nalloc;
      char *elts;
  } ap_array_header_t;
  
  struct ap_table_t {
      /* This has to be first to promote backwards compatibility with
       * older modules which cast a ap_table_t * to an ap_array_header_t *...
       * they should use the table_elts() function for most of the
       * cases they do this for.
       */
      ap_array_header_t a;
  #ifdef MAKE_TABLE_PROFILE
      void *creator;
  #endif
  };
  
  typedef struct ap_table_entry_t {
      char *key;          /* maybe NULL in future;
                           * check when iterating thru table_elts
                           */
      char *val;
  } ap_table_entry_t;
  
  /* XXX: these know about the definition of struct ap_table_t in alloc.c.  That
   * definition is not here because it is supposed to be private, and by not
   * placing it here we are able to get compile-time diagnostics from modules
   * written which assume that a ap_table_t is the same as an ap_array_header_t. -djg
   */
  #define ap_table_elts(t) ((ap_array_header_t *)(t))
  #define ap_is_empty_table(t) (((t) == NULL)||(((ap_array_header_t *)(t))->nelts == 0))
  
  APR_EXPORT(ap_array_header_t *) ap_make_array(struct ap_pool_t *p, int nelts,
  						int elt_size);
  APR_EXPORT(void *) ap_push_array(ap_array_header_t *arr);
  APR_EXPORT(void) ap_array_cat(ap_array_header_t *dst,
  			       const ap_array_header_t *src);
  APR_EXPORT(ap_array_header_t *) ap_copy_array(struct ap_pool_t *p,
  						const ap_array_header_t *arr);
  APR_EXPORT(ap_array_header_t *)
  	ap_copy_array_hdr(struct ap_pool_t *p,
  			   const ap_array_header_t *arr);
  APR_EXPORT(ap_array_header_t *)
  	ap_append_arrays(struct ap_pool_t *p,
  			  const ap_array_header_t *first,
  			  const ap_array_header_t *second);
  APR_EXPORT(char *) ap_array_pstrcat(struct ap_pool_t *p,
  				     const ap_array_header_t *arr,
  				     const char sep);
  APR_EXPORT(ap_table_t *) ap_make_table(struct ap_pool_t *p, int nelts);
  APR_EXPORT(ap_table_t *) ap_copy_table(struct ap_pool_t *p, const ap_table_t *t);
  APR_EXPORT(void) ap_clear_table(ap_table_t *t);
  APR_EXPORT(const char *) ap_table_get(const ap_table_t *t, const char *key);
  APR_EXPORT(void) ap_table_set(ap_table_t *t, const char *key,
  			       const char *val);
  APR_EXPORT(void) ap_table_setn(ap_table_t *t, const char *key,
  				const char *val);
  APR_EXPORT(void) ap_table_unset(ap_table_t *t, const char *key);
  APR_EXPORT(void) ap_table_merge(ap_table_t *t, const char *key,
  				 const char *val);
  APR_EXPORT(void) ap_table_mergen(ap_table_t *t, const char *key,
  				  const char *val);
  APR_EXPORT(void) ap_table_add(ap_table_t *t, const char *key,
  			       const char *val);
  APR_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key,
  				const char *val);
  APR_EXPORT(ap_table_t *) ap_overlay_tables(struct ap_pool_t *p,
  					     const ap_table_t *overlay,
  					     const ap_table_t *base);
  APR_EXPORT(void)
  	ap_table_do(int (*comp) (void *, const char *, const char *),
  		     void *rec, const ap_table_t *t, ...);
  #define AP_OVERLAP_TABLES_SET   (0)
  #define AP_OVERLAP_TABLES_MERGE (1)
  APR_EXPORT(void) ap_overlap_tables(ap_table_t *a, const ap_table_t *b,
  				    unsigned flags);
  
  #ifdef __cplusplus
  }
  #endif
  
  #endif	/* ! APR_TABLES_H */
  
  
  
  1.17      +1 -0      apache-2.0/src/lib/apr/lib/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_tables.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- apr_tables.c	2000/05/26 16:23:26	1.16
  +++ apr_tables.c	2000/06/08 19:29:39	1.17
  @@ -63,6 +63,7 @@
   
   #include "apr_general.h"
   #include "apr_pools.h"
  +#include "apr_tables.h"
   #include "apr_lib.h"
   #include "misc.h"
   #ifdef HAVE_STDLIB_H
  
  
  
  1.32      +0 -1      apache-2.0/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- os.h	2000/06/08 00:28:35	1.31
  +++ os.h	2000/06/08 19:29:40	1.32
  @@ -104,7 +104,6 @@
   #define NO_USE_SIGACTION
   /* #undef HAVE_TIMES */
   #define USE_LONGJMP
  -#define HAVE_MMAP
   #define USE_MMAP_SCOREBOARD
   #define HAVE_CANONICAL_FILENAME
   #define HAVE_DRIVE_LETTERS
  
  
  

Mime
View raw message