httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/modules/standard mod_asis.c mod_auth.c mod_autoindex.c mod_log_config.c mod_negotiation.c
Date Mon, 04 Oct 1999 16:38:19 GMT
rbb         99/10/04 09:38:18

  Modified:    src/ap   ap_hooks.c
               src/lib/apr/file_io/os2 dir.c fileacc.c filedup.c open.c
                        pipe.c
               src/lib/apr/file_io/unix dir.c fileacc.c filedup.c fileio.h
                        open.c pipe.c
               src/lib/apr/file_io/win32 dir.c fileacc.c filedup.c pipe.c
               src/lib/apr/include apr_file_io.h apr_general.h apr_lock.h
                        apr_network_io.h apr_portable.h apr_shmem.h
                        apr_thread_proc.h apr_time.h
               src/lib/apr/locks/beos locks.c
               src/lib/apr/locks/os2 locks.c
               src/lib/apr/locks/unix crossproc.c locks.c locks.h
               src/lib/apr/locks/win32 locks.c
               src/lib/apr/misc/beos start.c
               src/lib/apr/misc/os2 start.c
               src/lib/apr/misc/unix start.c
               src/lib/apr/misc/win32 start.c
               src/lib/apr/network_io/beos sockets.c sockopt.c
               src/lib/apr/network_io/os2 poll.c sockets.c sockopt.c
               src/lib/apr/network_io/unix poll.c sockets.c sockopt.c
               src/lib/apr/network_io/win32 poll.c sockets.c sockopt.c
               src/lib/apr/shmem shmem.c
               src/lib/apr/shmem/unix shmem.c
               src/lib/apr/test Makefile.in ab_apr.c abc.c client.c
                        htdigest.c server.c testargs.c testcontext.c
                        testfile.c testproc.c testsig.c testsock.c
                        testthread.c testtime.c
               src/lib/apr/threadproc/beos proc.c procsup.c thread.c
                        threadpriv.c
               src/lib/apr/threadproc/os2 proc.c thread.c threadpriv.c
               src/lib/apr/threadproc/unix proc.c procsup.c thread.c
                        threadpriv.c threadproc.h
               src/lib/apr/threadproc/win32 proc.c thread.c threadpriv.c
               src/lib/apr/time/os2 time.c
               src/lib/apr/time/unix access.c time.c
               src/lib/apr/time/win32 time.c
               src/main buff.c http_config.c http_core.c http_log.c
                        http_main.c http_protocol.c http_request.c listen.c
                        rfc1413.c util.c util_script.c
               src/modules/mpm/dexter acceptlock.c dexter.c
               src/modules/mpm/mpmt_pthread acceptlock.c mpmt_pthread.c
               src/modules/mpm/prefork prefork.c
               src/modules/standard mod_asis.c mod_auth.c mod_autoindex.c
                        mod_log_config.c mod_negotiation.c
  Log:
  First patch to re-order function parameters.  This one gets the low hanging
  fruit, and moves most of the result parameters to the first argument.
  Future patches in this series will move the rest of the result parameters
  to the beginning of the list, and will move the context's to the end of the
  list
  
  Revision  Changes    Path
  1.7       +1 -1      apache-2.0/src/ap/ap_hooks.c
  
  Index: ap_hooks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_hooks.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ap_hooks.c	1999/09/14 13:37:19	1.6
  +++ ap_hooks.c	1999/10/04 16:36:44	1.7
  @@ -118,7 +118,7 @@
       ap_array_header_t *pNew;
       int n;
   
  -    ap_create_context(g_pHookPool, &p);
  +    ap_create_context(&p, g_pHookPool);
       pSort=prepare(p,(TSortData *)pHooks->elts,pHooks->nelts);
       tsort(pSort,pHooks->nelts);
       pNew=ap_make_array(g_pHookPool,pHooks->nelts,sizeof(TSortData));
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/apr/file_io/os2/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/dir.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dir.c	1999/08/17 15:59:36	1.1
  +++ dir.c	1999/10/04 16:36:47	1.2
  @@ -69,7 +69,7 @@
   
   
   
  -ap_status_t ap_opendir(ap_context_t *cntxt, const char *dirname, struct dir_t **new)
  +ap_status_t ap_opendir(struct dir_t **new, ap_context_t *cntxt, const char *dirname)
   {
       struct dir_t *thedir = (struct dir_t *)ap_palloc(cntxt, sizeof(struct dir_t));
       
  @@ -212,7 +212,7 @@
   
   
   
  -ap_status_t ap_get_dir_filename(struct dir_t *thedir, char **new)
  +ap_status_t ap_get_dir_filename(char **new, struct dir_t *thedir)
   {
       if (thedir->validentry) {
           *new = thedir->entry.achName;
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/file_io/os2/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileacc.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fileacc.c	1999/08/17 15:59:36	1.1
  +++ fileacc.c	1999/10/04 16:36:47	1.2
  @@ -63,7 +63,7 @@
   
   /* A file to put ALL of the accessor functions for struct file_t types. */
   
  -ap_status_t ap_get_filename(struct file_t *thefile, char **new)
  +ap_status_t ap_get_filename(char **new, struct file_t *thefile)
   {
       if (thefile != NULL) {
           *new = ap_pstrdup(thefile->cntxt, thefile->fname);
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/file_io/os2/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filedup.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- filedup.c	1999/08/17 15:59:36	1.1
  +++ filedup.c	1999/10/04 16:36:47	1.2
  @@ -61,7 +61,7 @@
   #define INCL_DOS
   #include <os2.h>
   
  -ap_status_t ap_dupfile(struct file_t *old_file, struct file_t **new_file)
  +ap_status_t ap_dupfile(struct file_t **new_file, struct file_t *old_file)
   {
       int rv;
       struct file_t *dup_file = (struct file_t *)ap_palloc(old_file->cntxt, sizeof(struct file_t));
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/file_io/os2/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/open.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- open.c	1999/08/17 15:59:36	1.1
  +++ open.c	1999/10/04 16:36:47	1.2
  @@ -69,7 +69,7 @@
   
   
   
  -ap_status_t ap_open(ap_context_t *cntxt, char *fname, ap_int32_t flag,  ap_fileperms_t perm, struct file_t **new)
  +ap_status_t ap_open(struct file_t **new, ap_context_t *cntxt, char *fname, ap_int32_t flag,  ap_fileperms_t perm)
   {
       int oflags = 0;
       int mflags = OPEN_FLAGS_FAIL_ON_ERROR|OPEN_SHARE_DENYNONE;
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/apr/file_io/os2/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/pipe.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pipe.c	1999/08/17 15:59:36	1.1
  +++ pipe.c	1999/10/04 16:36:47	1.2
  @@ -59,7 +59,7 @@
   #include "apr_lib.h"
   #include <string.h>
   
  -ap_status_t ap_create_pipe(ap_context_t *cont, struct file_t **in, struct file_t **out)
  +ap_status_t ap_create_pipe(struct file_t **in, struct file_t **out, ap_context_t *cont)
   {
       ULONG filedes[2];
       ULONG rc;
  @@ -89,7 +89,7 @@
   
   
   
  -ap_status_t ap_create_namedpipe(ap_context_t *cont, char *dirpath, ap_fileperms_t perm, char **new)
  +ap_status_t ap_create_namedpipe(char **new, ap_context_t *cont, char *dirpath, ap_fileperms_t perm)
   {
       /* Not yet implemented, interface not suitable */
       return -1;
  
  
  
  1.5       +6 -6      apache-2.0/src/lib/apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- dir.c	1999/10/04 13:37:19	1.4
  +++ dir.c	1999/10/04 16:36:49	1.5
  @@ -75,13 +75,13 @@
   } 
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_opendir(ap_context_t *, char *, ap_dir_t **)
  + * ap_status_t ap_opendir(ap_dir_t **, ap_context_t *, char *)
    *    Open the specified directory. 
    * arg 1) The context to use.
    * arg 2) The full path to the directory (use / on all systems)
    * arg 3) The opened directory descriptor.
    */                        
  -ap_status_t ap_opendir(ap_context_t *cont, const char *dirname, struct dir_t **new)
  +ap_status_t ap_opendir(struct dir_t **new, ap_context_t *cont, const char *dirname)
   {
       (*new) = (struct dir_t *)ap_palloc(cont, sizeof(struct dir_t));
   
  @@ -272,12 +272,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_dir_filename(ap_dir_t *, char **) 
  + * ap_status_t ap_get_dir_filename(char **, ap_dir_t *) 
    *    Get the file name of the current directory entry. 
    * arg 1) the currently open directory.
    * arg 2) the file name of the directory entry. 
    */                        
  -ap_status_t ap_get_dir_filename(struct dir_t *thedir, char **new)
  +ap_status_t ap_get_dir_filename(char **new, struct dir_t *thedir)
   {
       (*new) = ap_pstrdup(thedir->cntxt, thedir->entry->d_name);
       return APR_SUCCESS;
  @@ -304,8 +304,8 @@
    * arg 1) The os specific dir to convert
    * arg 2) The apr dir we are converting to.
    */
  -ap_status_t ap_put_os_dir(ap_context_t *cont, struct dir_t **dir,
  -                            ap_os_dir_t *thedir)
  +ap_status_t ap_put_os_dir(struct dir_t **dir, ap_os_dir_t *thedir,
  +                          ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  
  
  
  1.7       +3 -3      apache-2.0/src/lib/apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- fileacc.c	1999/10/04 13:37:19	1.6
  +++ fileacc.c	1999/10/04 16:36:50	1.7
  @@ -64,12 +64,12 @@
   /* A file to put ALL of the accessor functions for struct file_t types. */
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_filename(ap_file_t *, char **)
  + * ap_status_t ap_get_filename(char **, ap_file_t *)
    *    return the file name of the current file.
    * arg 1) The currently open file.
    * arg 2) The path of the file.  
    */                     
  -ap_status_t ap_get_filename(struct file_t *thefile, char **new)
  +ap_status_t ap_get_filename(char **new, struct file_t *thefile)
   {
       if (thefile != NULL) {
           *new = ap_pstrdup(thefile->cntxt, thefile->fname);
  @@ -260,7 +260,7 @@
   ap_status_t ap_get_filedata(struct file_t *file, char *key, void *data)
   {    
       if (file != NULL) {
  -        return ap_get_userdata(file->cntxt, key, &data);
  +        return ap_get_userdata(&data, file->cntxt, key);
       }
       else {
           data = NULL;
  
  
  
  1.3       +2 -2      apache-2.0/src/lib/apr/file_io/unix/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filedup.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- filedup.c	1999/09/12 10:52:13	1.2
  +++ filedup.c	1999/10/04 16:36:50	1.3
  @@ -60,12 +60,12 @@
   #include <string.h>
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_dupfile(ap_file_t *, ap_file_t **)
  + * ap_status_t ap_dupfile(ap_file_t **, ap_file_t *)
    *    duplicate the specified file descriptor.
    * arg 1) The file to duplicate.
    * arg 2) The structure to duplicate into. 
    */         
  -ap_status_t ap_dupfile(struct file_t *old_file, struct file_t **new_file)
  +ap_status_t ap_dupfile(struct file_t **new_file, struct file_t *old_file)
   {
       char *buf_oflags;
       (*new_file) = (struct file_t *)ap_palloc(old_file->cntxt,
  
  
  
  1.2       +3 -0      apache-2.0/src/lib/apr/file_io/unix/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fileio.h	1999/08/17 15:59:36	1.1
  +++ fileio.h	1999/10/04 16:36:50	1.2
  @@ -65,6 +65,9 @@
   #include "apr_general.h"
   #include "apr_file_io.h"
   #include "apr_errno.h"
  +#ifdef BEOS
  +#include <kernel/OS.h>
  +#endif
   
   struct file_t {
       ap_context_t *cntxt;
  
  
  
  1.12      +3 -3      apache-2.0/src/lib/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- open.c	1999/09/13 14:06:41	1.11
  +++ open.c	1999/10/04 16:36:50	1.12
  @@ -103,7 +103,7 @@
    * NOTE:  If mode is APR_OS_DEFAULT, the system open command will be 
    *        called without any mode parameters.
    */
  -ap_status_t ap_open(ap_context_t *cont, const char *fname, ap_int32_t flag,  ap_fileperms_t perm, struct file_t **new)
  +ap_status_t ap_open(struct file_t **new, ap_context_t *cont, const char *fname, ap_int32_t flag,  ap_fileperms_t perm)
   {
       int oflags = 0;
       mode_t mode = get_fileperms(perm);    
  @@ -246,8 +246,8 @@
    * NOTE:  On Unix, it is only possible to put a file descriptor into
    *        an apr file type.
    */
  -ap_status_t ap_put_os_file(ap_context_t *cont, struct file_t **file, 
  -                            ap_os_file_t *thefile)
  +ap_status_t ap_put_os_file(struct file_t **file, ap_os_file_t *thefile,
  +                           ap_context_t *cont)
   {
       int *dafile = thefile;
       if ((*file) == NULL) {
  
  
  
  1.2       +4 -4      apache-2.0/src/lib/apr/file_io/unix/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/pipe.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pipe.c	1999/08/17 15:59:36	1.1
  +++ pipe.c	1999/10/04 16:36:50	1.2
  @@ -64,13 +64,13 @@
   #include <sys/stat.h>
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_create_pipe(ap_context_t *, ap_file_t **, ap_file_t **)
  + * ap_status_t ap_create_pipe(ap_file_t **, ap_context_t *, ap_file_t **)
    *    Create an anonymous pipe.
    * arg 1) The context to operate on.
    * arg 2) The file descriptor to use as input to the pipe.
    * arg 3) The file descriptor to use as output from the pipe.
    */
  -ap_status_t ap_create_pipe(ap_context_t *cont, struct file_t **in, struct file_t **out)
  +ap_status_t ap_create_pipe(struct file_t **in, struct file_t **out, ap_context_t *cont)
   {
       int filedes[2];
   
  @@ -100,8 +100,8 @@
    * arg 3) The permissions for the newly created pipe.
    * arg 4) The name of the new pipe. 
    */
  -ap_status_t ap_create_namedpipe(ap_context_t *cont, char *dirpath, 
  -                                ap_fileperms_t perm, char **new)
  +ap_status_t ap_create_namedpipe(char **new, ap_context_t *cont, char *dirpath, 
  +                                ap_fileperms_t perm)
   {
       mode_t mode = get_fileperms(perm);
   
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dir.c	1999/08/17 15:59:36	1.1
  +++ dir.c	1999/10/04 16:36:52	1.2
  @@ -84,7 +84,7 @@
       }
   } 
   
  -ap_status_t ap_opendir(ap_context_t *cont, const char *dirname, struct dir_t **new)
  +ap_status_t ap_opendir(struct dir_t **new, ap_context_t *cont, const char *dirname)
   {
   	char * temp;
   	(*new) = ap_palloc(cont, sizeof(struct dir_t));
  @@ -203,7 +203,7 @@
   	}
   }
   
  -ap_status_t ap_get_dir_filename(struct dir_t *thedir, char **new)
  +ap_status_t ap_get_dir_filename(char **new, struct dir_t *thedir)
   {
       (*new) = ap_pstrdup(thedir->cntxt, thedir->entry->cFileName);
       return APR_SUCCESS;
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/file_io/win32/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileacc.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- fileacc.c	1999/09/24 18:49:01	1.3
  +++ fileacc.c	1999/10/04 16:36:52	1.4
  @@ -63,7 +63,7 @@
   
   /* A file to put ALL of the accessor functions for struct file_t types. */
   
  -ap_status_t ap_get_filename(struct file_t *thefile, char **new)
  +ap_status_t ap_get_filename(char **new, struct file_t *thefile)
   {
       if (thefile != NULL) {
           *new = ap_pstrdup(thefile->cntxt, thefile->fname);
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/file_io/win32/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filedup.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- filedup.c	1999/08/17 15:59:36	1.1
  +++ filedup.c	1999/10/04 16:36:52	1.2
  @@ -59,7 +59,7 @@
   #include "apr_lib.h"
   #include <string.h>
   
  -ap_status_t ap_dupfile(struct file_t *old_file, struct file_t **new_file)
  +ap_status_t ap_dupfile(struct file_t **new_file, struct file_t *old_file)
   {
       (*new_file) = (struct file_t *)ap_palloc(old_file->cntxt,
                                  sizeof(struct file_t));
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/apr/file_io/win32/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/pipe.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pipe.c	1999/08/17 15:59:37	1.1
  +++ pipe.c	1999/10/04 16:36:53	1.2
  @@ -63,7 +63,7 @@
   #include <sys/types.h>
   #include <sys/stat.h>
   
  -ap_status_t ap_create_pipe(ap_context_t *cont, struct file_t **in, struct file_t **out)
  +ap_status_t ap_create_pipe(struct file_t **in, struct file_t **out, ap_context_t *cont)
   {
       SECURITY_ATTRIBUTES sa;
   
  @@ -87,7 +87,7 @@
   }
   
   /*
  -ap_status_t ap_create_namedpipe(ap_context_t *cont, char *dirpath, ap_fileperms_t perm, char **new)
  +ap_status_t ap_create_namedpipe(char **new, ap_context_t *cont, char *dirpath, ap_fileperms_t perm)
   {
       mode_t mode = get_fileperms(perm);
   
  
  
  
  1.6       +7 -7      apache-2.0/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_file_io.h	1999/09/14 13:37:20	1.5
  +++ apr_file_io.h	1999/10/04 16:36:54	1.6
  @@ -107,7 +107,7 @@
   typedef ap_int32_t               ap_fileperms_t;
   
   /*   Function definitions */
  -ap_status_t ap_open(ap_context_t *, const char *, ap_int32_t, ap_fileperms_t, ap_file_t **);
  +ap_status_t ap_open(ap_file_t **, ap_context_t *, const char *, ap_int32_t, ap_fileperms_t);
   ap_status_t ap_close(ap_file_t *);
   ap_status_t ap_remove_file(ap_context_t *, char *);
   ap_status_t ap_eof(ap_file_t *);
  @@ -124,23 +124,23 @@
   API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...)
           __attribute__((format(printf,2,3)));
   
  -ap_status_t ap_dupfile(ap_file_t *, ap_file_t **);
  +ap_status_t ap_dupfile(ap_file_t **, ap_file_t *);
   ap_status_t ap_getfileinfo(ap_file_t *);
   ap_status_t ap_seek(ap_file_t *, ap_seek_where_t, ap_off_t *);
   
  -ap_status_t ap_opendir(ap_context_t *, const char *, ap_dir_t **);
  +ap_status_t ap_opendir(ap_dir_t **, ap_context_t *, const char *);
   ap_status_t ap_closedir(ap_dir_t *);
   ap_status_t ap_readdir(ap_dir_t *);
   ap_status_t ap_rewinddir(ap_dir_t *);
   ap_status_t ap_make_dir(ap_context_t *, const char *, ap_fileperms_t);
   ap_status_t ap_remove_dir(ap_context_t *, const char *);
   
  -ap_status_t ap_create_pipe(ap_context_t *, ap_file_t **, ap_file_t **);
  -ap_status_t ap_create_namedpipe(ap_context_t *, char *, ap_fileperms_t, char **);
  +ap_status_t ap_create_pipe(ap_file_t **, ap_file_t **, ap_context_t *);
  +ap_status_t ap_create_namedpipe(char **, ap_context_t *, char *, ap_fileperms_t);
   
   /*accessor and general file_io functions. */
  -ap_status_t ap_get_filename(ap_file_t *, char **);
  -ap_status_t ap_get_dir_filename(ap_dir_t *, char **);
  +ap_status_t ap_get_filename(char **, ap_file_t *);
  +ap_status_t ap_get_dir_filename(char **, ap_dir_t *);
   ap_status_t ap_get_filedata(ap_file_t *, char *, void *);
   ap_status_t ap_set_filedata(ap_file_t *, void *, char *,
                               ap_status_t (*cleanup) (void *));
  
  
  
  1.5       +2 -2      apache-2.0/src/lib/apr/include/apr_general.h
  
  Index: apr_general.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_general.h	1999/10/01 16:18:30	1.4
  +++ apr_general.h	1999/10/04 16:36:54	1.5
  @@ -225,12 +225,12 @@
   #endif
   
   /* Context functions */
  -ap_status_t ap_create_context(ap_context_t *, ap_context_t **);
  +ap_status_t ap_create_context(ap_context_t **, ap_context_t *);
   ap_status_t ap_destroy_context(struct context_t *cont);
   ap_status_t ap_exit(ap_context_t *);
   ap_status_t ap_set_userdata(ap_context_t *, void *, char *, 
                               ap_status_t (*cleanup) (void *));
  -ap_status_t ap_get_userdata(ap_context_t *, char *, void **);
  +ap_status_t ap_get_userdata(void **, ap_context_t *, char *);
   ap_status_t ap_initialize(void);
   
   ap_status_t ap_create_signal(ap_context_t *, ap_signum_t);
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/include/apr_lock.h
  
  Index: apr_lock.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lock.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_lock.h	1999/09/20 21:33:05	1.3
  +++ apr_lock.h	1999/10/04 16:36:54	1.4
  @@ -75,7 +75,7 @@
   ap_status_t ap_lock(ap_lock_t *);
   ap_status_t ap_unlock(ap_lock_t *);
   ap_status_t ap_destroy_lock(ap_lock_t *);
  -ap_status_t ap_child_init_lock(ap_context_t *, char *, ap_lock_t **);
  +ap_status_t ap_child_init_lock(ap_lock_t **, ap_context_t *, char *);
   
   ap_status_t ap_get_lockdata(ap_lock_t *, char *, void *);
   ap_status_t ap_set_lockdata(ap_lock_t *, void *, char *,
  
  
  
  1.8       +4 -4      apache-2.0/src/lib/apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_network_io.h	1999/09/24 21:50:51	1.7
  +++ apr_network_io.h	1999/10/04 16:36:54	1.8
  @@ -104,16 +104,16 @@
   
   /* function definitions */
   
  -ap_status_t ap_create_tcp_socket(ap_context_t *, ap_socket_t **);
  +ap_status_t ap_create_tcp_socket(ap_socket_t **, ap_context_t *);
   ap_status_t ap_shutdown(ap_socket_t *, ap_shutdown_how_e);
   ap_status_t ap_close_socket(ap_socket_t *);
   
   ap_status_t ap_bind(ap_socket_t *);
   ap_status_t ap_listen(ap_socket_t *, ap_int32_t);
  -ap_status_t ap_accept(const ap_socket_t *, ap_socket_t **);
  +ap_status_t ap_accept(ap_socket_t **, const ap_socket_t *);
   ap_status_t ap_connect(ap_socket_t *, char *);
   
  -ap_status_t ap_get_remote_hostname(ap_socket_t *, char **);
  +ap_status_t ap_get_remote_hostname(char **, ap_socket_t *);
   ap_status_t ap_gethostname(ap_context_t *, char *, int);
   ap_status_t ap_get_socketdata(ap_socket_t *, char *, void *);
   ap_status_t ap_set_socketdata(ap_socket_t *, void *, char *,
  @@ -128,7 +128,7 @@
   ap_status_t ap_getport(ap_socket_t *, ap_uint32_t *);
   ap_status_t ap_getipaddr(char *buf, ap_ssize_t len, const ap_socket_t *sock);
   
  -ap_status_t ap_setup_poll(ap_context_t *, ap_int32_t, ap_pollfd_t **);
  +ap_status_t ap_setup_poll(ap_pollfd_t **, ap_context_t *, ap_int32_t);
   ap_status_t ap_poll(ap_pollfd_t *, ap_int32_t *, ap_int32_t);
   ap_status_t ap_add_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t);
   ap_status_t ap_remove_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t);
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/include/apr_portable.h
  
  Index: apr_portable.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_portable.h	1999/09/13 19:38:00	1.4
  +++ apr_portable.h	1999/10/04 16:36:54	1.5
  @@ -186,17 +186,17 @@
   ap_status_t ap_get_os_lock(ap_lock_t *, ap_os_lock_t *);     
   ap_status_t ap_get_os_thread(ap_thread_t *, ap_os_thread_t *);
   ap_status_t ap_get_os_proc(ap_proc_t *, ap_os_proc_t *);     
  -ap_status_t ap_get_os_time(ap_time_t *, ap_os_time_t **);     
  +ap_status_t ap_get_os_time(ap_os_time_t **, ap_time_t *);     
   ap_status_t ap_get_os_threadkey(ap_key_t *, ap_os_threadkey_t *);
   
  -ap_status_t ap_put_os_file(ap_context_t *, ap_file_t **, ap_os_file_t *); 
  -ap_status_t ap_put_os_dir(ap_context_t *, ap_dir_t **, ap_os_dir_t *); 
  -ap_status_t ap_put_os_sock(ap_context_t *, ap_socket_t **, ap_os_sock_t *);
  -ap_status_t ap_put_os_lock(ap_context_t *, ap_lock_t **, ap_os_lock_t *); 
  -ap_status_t ap_put_os_thread(ap_context_t *, ap_thread_t **, ap_os_thread_t *);
  -ap_status_t ap_put_os_proc(ap_context_t *, ap_proc_t **, ap_os_proc_t *); 
  -ap_status_t ap_put_os_time(ap_context_t *, ap_time_t **, ap_os_time_t *); 
  -ap_status_t ap_put_os_threadkey(ap_context_t *, ap_key_t **, ap_os_threadkey_t *);
  +ap_status_t ap_put_os_file(ap_file_t **, ap_os_file_t *, ap_context_t *); 
  +ap_status_t ap_put_os_dir(ap_dir_t **, ap_os_dir_t *, ap_context_t *); 
  +ap_status_t ap_put_os_sock(ap_socket_t **, ap_os_sock_t *, ap_context_t *);
  +ap_status_t ap_put_os_lock(ap_lock_t **, ap_os_lock_t *, ap_context_t *); 
  +ap_status_t ap_put_os_thread(ap_thread_t **, ap_os_thread_t *, ap_context_t *);
  +ap_status_t ap_put_os_proc(ap_proc_t **, ap_os_proc_t *, ap_context_t *); 
  +ap_status_t ap_put_os_time(ap_time_t **, ap_os_time_t *, ap_context_t *); 
  +ap_status_t ap_put_os_threadkey(ap_key_t **, ap_os_threadkey_t *, ap_context_t *);
   
   #ifdef __cplusplus
   }
  
  
  
  1.2       +6 -6      apache-2.0/src/lib/apr/include/apr_shmem.h
  
  Index: apr_shmem.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_shmem.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_shmem.h	1999/08/17 15:59:37	1.1
  +++ apr_shmem.h	1999/10/04 16:36:55	1.2
  @@ -65,17 +65,17 @@
   
   typedef   struct shmem_t ap_shmem_t
   
  -ap_status_t ap_shm_create(ap_context_t *, ap_size_t, const char *, ap_shmem_t **);
  +ap_status_t ap_shm_create(ap_shmem_t **, ap_context_t *, ap_size_t, const char *);
   ap_status_t ap_shm_destroy(ap_shmem_t *);
  -ap_status_t ap_shm_malloc(ap_shmem_t *, ap_size_t, void **);
  -ap_status_t ap_shm_calloc(ap_shmem_t *, ap_size_t, ap_size_t, void **);
  -ap_status_t ap_shm_realloc(ap_shmem_t *, ap_size_t, void **);
  +ap_status_t ap_shm_malloc(void **, ap_shmem_t *, ap_size_t);
  +ap_status_t ap_shm_calloc(void **, ap_shmem_t *, ap_size_t, ap_size_t);
  +ap_status_t ap_shm_realloc(void **, ap_shmem_t *, ap_size_t);
   ap_status_t ap_shm_free(ap_shmem_t *, void *);
  -ap_status_t ap_shm_strdup(ap_shmem_t *, const char *, char **);
  +ap_status_t ap_shm_strdup(char **, ap_shmem_t *, const char *);
   ap_status_t ap_shm_sizeof(ap_shmem_t *, void *, ap_size_t *);
   ap_status_t ap_shm_maxsize(ap_size_t *);
   ap_status_t ap_shm_available(ap_shmem_t *, ap_size_t *);
  -ap_status_t ap_shm_child_create(ap_context_t *, const char *, ap_shmem_t**);
  +ap_status_t ap_shm_child_create(ap_shmem_t**, ap_context_t *, const char *);
   
   #ifdef __cplusplus
   }
  
  
  
  1.3       +7 -7      apache-2.0/src/lib/apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_thread_proc.h	1999/09/14 13:37:21	1.2
  +++ apr_thread_proc.h	1999/10/04 16:36:55	1.3
  @@ -83,7 +83,7 @@
   typedef void *(API_THREAD_FUNC *ap_thread_start_t)(void *);
   
   /* Thread Function definitions */
  -ap_status_t ap_create_threadattr(ap_context_t *, ap_threadattr_t **);
  +ap_status_t ap_create_threadattr(ap_threadattr_t **, ap_context_t *);
   ap_status_t ap_setthreadattr_detach(ap_threadattr_t *, ap_int32_t);
   ap_status_t ap_getthreadattr_detach(ap_threadattr_t *);
   ap_status_t ap_create_thread(ap_context_t *, ap_threadattr_t *, 
  @@ -101,7 +101,7 @@
   
   ap_status_t ap_create_thread_private(ap_context_t *, void (*dest)(void *), 
                                        ap_key_t **);
  -ap_status_t ap_get_thread_private(ap_key_t *, void **);
  +ap_status_t ap_get_thread_private(void **, ap_key_t *);
   ap_status_t ap_set_thread_private(ap_key_t *, void *);
   ap_status_t ap_delete_thread_private(ap_key_t *);
   ap_status_t ap_get_threadkeydata(ap_key_t *, char *, void *);
  @@ -109,7 +109,7 @@
                                    ap_status_t (*cleanup) (void *));
   
   /* Process Function definitions */
  -ap_status_t ap_createprocattr_init(ap_context_t *, ap_procattr_t **);
  +ap_status_t ap_createprocattr_init(ap_procattr_t **, ap_context_t *);
   ap_status_t ap_setprocattr_io(ap_procattr_t *, ap_int32_t, ap_int32_t, 
                                 ap_int32_t);
   ap_status_t ap_setprocattr_dir(ap_procattr_t *, char *);
  @@ -119,11 +119,11 @@
   ap_status_t ap_set_procdata(ap_proc_t *, void *, char *,
                               ap_status_t (*cleanup) (void *));
   
  -ap_status_t ap_get_childin(ap_proc_t *, ap_file_t **);
  -ap_status_t ap_get_childout(ap_proc_t *, ap_file_t **);
  -ap_status_t ap_get_childerr(ap_proc_t *, ap_file_t **);
  +ap_status_t ap_get_childin(ap_file_t **, ap_proc_t *);
  +ap_status_t ap_get_childout(ap_file_t **, ap_proc_t *);
  +ap_status_t ap_get_childerr(ap_file_t **, ap_proc_t *);
   
  -ap_status_t ap_fork(ap_context_t *, ap_proc_t **);
  +ap_status_t ap_fork(ap_proc_t **, ap_context_t *);
   ap_status_t ap_create_process(ap_context_t *, char *, char *const [], char **, 
                                 ap_procattr_t *, ap_proc_t **);
   ap_status_t ap_wait_proc(ap_proc_t *, ap_wait_how_e);
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/include/apr_time.h
  
  Index: apr_time.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_time.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_time.h	1999/09/14 13:37:21	1.2
  +++ apr_time.h	1999/10/04 16:36:55	1.3
  @@ -68,7 +68,7 @@
   typedef struct atime_t       ap_time_t;
   
   /* Function Definitions */
  -ap_status_t ap_make_time(ap_context_t *, ap_time_t **);
  +ap_status_t ap_make_time(ap_time_t **, ap_context_t *);
   ap_status_t ap_current_time(ap_time_t *);
   ap_status_t ap_explode_time(ap_time_t *, ap_timetype_e);
   ap_status_t ap_implode_time(ap_time_t *);
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/locks/beos/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- locks.c	1999/08/17 15:59:42	1.1
  +++ locks.c	1999/10/04 16:36:57	1.2
  @@ -59,7 +59,7 @@
   #include <strings.h>
   #include <stdio.h>
   
  -ap_status_t ap_create_lock(ap_context_t *cont, ap_locktype_e type, char *fname, struct lock_t **lock)
  +ap_status_t ap_create_lock(struct lock_t **lock, ap_context_t *cont, ap_locktype_e type, char *fname)
   {
       struct lock_t *new;
       ap_status_t stat;
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/locks/os2/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- locks.c	1999/08/17 15:59:42	1.1
  +++ locks.c	1999/10/04 16:36:57	1.2
  @@ -70,7 +70,7 @@
   
   
   
  -ap_status_t ap_create_lock(ap_context_t *cont, ap_locktype_e type, char *fname, struct lock_t **lock)
  +ap_status_t ap_create_lock(struct lock_t **lock, ap_context_t *cont, ap_locktype_e type, char *fname)
   {
       struct lock_t *new;
       ULONG rc;
  
  
  
  1.5       +4 -4      apache-2.0/src/lib/apr/locks/unix/crossproc.c
  
  Index: crossproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/crossproc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- crossproc.c	1999/10/01 16:18:34	1.4
  +++ crossproc.c	1999/10/04 16:36:58	1.5
  @@ -129,7 +129,7 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(ap_context_t *cont, char *fname, struct lock_t **lock)
  +ap_status_t child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
   {
       return APR_SUCCESS;
   }
  @@ -223,7 +223,7 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(ap_context_t *cont, char *fname, struct lock_t **lock)
  +ap_status_t child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
   {
       return APR_SUCCESS;
   }
  @@ -297,7 +297,7 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(ap_context_t *cont, char *fname, struct lock_t **lock)
  +ap_status_t child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
   {
       return APR_SUCCESS;
   }
  @@ -356,7 +356,7 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(ap_context_t *cont, char *fname, struct lock_t **lock)
  +ap_status_t child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
   {
       struct lock_t *new;
   
  
  
  
  1.5       +7 -7      apache-2.0/src/lib/apr/locks/unix/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- locks.c	1999/09/20 21:33:07	1.4
  +++ locks.c	1999/10/04 16:36:58	1.5
  @@ -170,7 +170,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_child_init_lock(ap_context_t *, char *, ap_lock_t **)
  + * ap_status_t ap_child_init_lock(ap_lock_t **, ap_context_t *, char *)
    *    Re-open a lock in a child process. 
    * arg 1) The context to operate on.
    * arg 2) A file name to use if the lock mechanism requires one.  This
  @@ -183,11 +183,11 @@
    *        idea to call it regardless, because it makes the code more
    *        portable. 
    */
  -ap_status_t ap_child_init_lock(ap_context_t *cont, char *fname, struct lock_t **lock)
  +ap_status_t ap_child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
   {
       ap_status_t stat;
       if ((*lock)->type != APR_CROSS_PROCESS) {
  -        if ((stat = child_init_lock(cont, fname, lock)) != APR_SUCCESS) {
  +        if ((stat = child_init_lock(lock, cont, fname)) != APR_SUCCESS) {
               return stat;
           }
       }
  @@ -204,7 +204,7 @@
   ap_status_t ap_get_lockdata(struct lock_t *lock, char *key, void *data)
   {
       if (lock != NULL) {
  -        return ap_get_userdata(lock->cntxt, key, &data);
  +        return ap_get_userdata(&data, lock->cntxt, key);
       }
       else {
           data = NULL;
  @@ -260,14 +260,14 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_put_os_lock(ap_context_t *, ap_lock_t **, ap_os_lock_t *)
  + * ap_status_t ap_put_os_lock(ap_lock_t **, ap_os_lock_t *, ap_context_t *)
    *    onvert the lock from os specific type to apr type
    * arg 1) The context to use if it is needed.
    * arg 2) The apr lock we are converting to.
    * arg 3) The os specific lock to convert.
    */
  -ap_status_t ap_put_os_lock(ap_context_t *cont, struct lock_t **lock, 
  -                           ap_os_lock_t *thelock)
  +ap_status_t ap_put_os_lock(struct lock_t **lock, ap_os_lock_t *thelock, 
  +                           ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/locks/unix/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- locks.h	1999/09/20 23:14:18	1.3
  +++ locks.h	1999/10/04 16:36:58	1.4
  @@ -121,8 +121,8 @@
   ap_status_t unlock_inter(struct lock_t *lock);
   ap_status_t destroy_inter_lock(struct lock_t *lock);
   
  -ap_status_t child_init_lock(ap_context_t *cont, char *fname,
  -			    struct lock_t **lock);
  +ap_status_t child_init_lock(struct lock_t **lock, ap_context_t *cont, 
  +                            char *fname);
   
   #endif  /* LOCKS_H */
   
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/locks/win32/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- locks.c	1999/09/22 14:14:01	1.2
  +++ locks.c	1999/10/04 16:36:59	1.3
  @@ -85,7 +85,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_child_init_lock(ap_context_t *cont, char *fname, struct lock_t **lock)
  +ap_status_t ap_child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
   {
       (*lock) = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
   
  
  
  
  1.5       +2 -2      apache-2.0/src/lib/apr/misc/beos/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/start.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- start.c	1999/09/07 13:16:45	1.4
  +++ start.c	1999/10/04 16:37:00	1.5
  @@ -63,7 +63,7 @@
   #include <errno.h>
   #include <string.h>
   
  -ap_status_t ap_create_context(ap_context_t *cont, void *data, ap_context_t **newcont)
  +ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont, void *data)
   {
       ap_context_t *new;
       ap_pool_t *pool;
  @@ -113,7 +113,7 @@
       return APR_ENOCONT;
   }
   
  -ap_status_t ap_get_userdata(struct context_t *cont, void **data)
  +ap_status_t ap_get_userdata(void **data, struct context_t *cont)
   {
       if (cont) { 
           (*data) = cont->prog_data;
  
  
  
  1.6       +3 -3      apache-2.0/src/lib/apr/misc/os2/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/os2/start.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- start.c	1999/08/31 16:14:19	1.5
  +++ start.c	1999/10/04 16:37:00	1.6
  @@ -60,7 +60,7 @@
   #include <errno.h>
   #include <string.h>
   
  -ap_status_t ap_create_context(struct context_t *cont, void *data, ap_context_t **newcont)
  +ap_status_t ap_create_context(ap_context_t **newcont, struct context_t *cont, void *data)
   {
       struct context_t *new;
       ap_pool_t *pool;
  @@ -117,12 +117,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_userdata(ap_context_t *, void **)
  + * ap_status_t ap_get_userdata(void **, ap_context_t *)
    *    Return the data associated with the current context.
    * arg 1) The current context.
    * arg 2) The user data associated with the context.
    */
  -ap_status_t ap_get_userdata(struct context_t *cont, void **data)
  +ap_status_t ap_get_userdata(void **data, struct context_t *cont)
   {
       if (cont) {
           (*data) = cont->prog_data;
  
  
  
  1.8       +4 -4      apache-2.0/src/lib/apr/misc/unix/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- start.c	1999/09/20 21:34:23	1.7
  +++ start.c	1999/10/04 16:37:01	1.8
  @@ -66,7 +66,7 @@
   #endif
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_create_context(ap_context_t *, ap_context_t **)
  + * ap_status_t ap_create_context(ap_context_t **, ap_context_t *)
    *    Create a new context.
    * arg 1) The parent context.  If this is NULL, the new context is a root
    *        context.  If it is non-NULL, the new context will inherit all
  @@ -74,7 +74,7 @@
    *        sub-pool.
    * arg 2) The context we have just created.
    */
  -ap_status_t ap_create_context(struct context_t *cont, struct context_t **newcont)
  +ap_status_t ap_create_context(struct context_t **newcont, struct context_t *cont)
   {
       struct context_t *new;
       ap_pool_t *pool;
  @@ -164,13 +164,13 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_userdata(ap_context_t *, void **)
  + * ap_status_t ap_get_userdata(void **, ap_context_t *)
    *    Return the data associated with the current context.
    * arg 1) The current context.
    * arg 2) The key for the data to retrieve
    * arg 3) The user data associated with the context.
    */
  -ap_status_t ap_get_userdata(struct context_t *cont, char *key, void **data)
  +ap_status_t ap_get_userdata(void **data, struct context_t *cont, char *key)
   {
       datastruct *dptr = NULL;
       if (cont) { 
  
  
  
  1.6       +2 -2      apache-2.0/src/lib/apr/misc/win32/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- start.c	1999/09/22 13:29:27	1.5
  +++ start.c	1999/10/04 16:37:03	1.6
  @@ -69,7 +69,7 @@
   }
       
   
  -ap_status_t ap_create_context(ap_context_t *cont, ap_context_t **newcont)
  +ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont)
   {
       int iVersionRequested;
       WSADATA wsaData;
  @@ -177,7 +177,7 @@
       return APR_ENOCONT;
   }
   
  -ap_status_t ap_get_userdata(struct context_t *cont, char *key, void **data)
  +ap_status_t ap_get_userdata(void **data, struct context_t *cont, char *key)
   {
       datastruct *dptr = NULL;
       if (cont) { 
  
  
  
  1.3       +2 -2      apache-2.0/src/lib/apr/network_io/beos/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sockets.c	1999/10/02 23:11:36	1.2
  +++ sockets.c	1999/10/04 16:37:06	1.3
  @@ -74,7 +74,7 @@
       }
   }
   
  -ap_status_t ap_create_tcp_socket(ap_context_t *cont, struct socket_t **new)
  +ap_status_t ap_create_tcp_socket(struct socket_t **new, ap_context_t *cont)
   {
       (*new) = (struct socket_t *)ap_palloc(cont,sizeof(struct socket_t));
       
  @@ -169,7 +169,7 @@
           return APR_SUCCESS; 
   } 
   
  -ap_status_t ap_accept(const struct socket_t *sock, struct socket_t **new) 
  +ap_status_t ap_accept(struct socket_t **new, const struct socket_t *sock) 
   { 
   	struct hostent *hptr;
   	
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/network_io/beos/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sockopt.c	1999/10/02 23:11:37	1.2
  +++ sockopt.c	1999/10/04 16:37:06	1.3
  @@ -100,7 +100,7 @@
   	}
   }
   
  -ap_status_t ap_get_remote_hostname(struct socket_t *sock, char **name)
  +ap_status_t ap_get_remote_hostname(char **name, struct socket_t *sock)
   {
       (*name) = (char*)ap_pstrdup(sock->cntxt, sock->remote_hostname);
       if (*name) {
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/network_io/os2/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/poll.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- poll.c	1999/08/28 08:05:45	1.2
  +++ poll.c	1999/10/04 16:37:08	1.3
  @@ -62,7 +62,7 @@
   
   /*  OS/2 doesn't have a poll function, implement using select */
    
  -ap_status_t ap_setup_poll(ap_context_t *cont, ap_int32_t num, struct pollfd_t **new)
  +ap_status_t ap_setup_poll(struct pollfd_t **new, ap_context_t *cont, ap_int32_t num)
   {
       (*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t) * num);
   
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/apr/network_io/os2/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockets.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sockets.c	1999/08/17 15:59:43	1.1
  +++ sockets.c	1999/10/04 16:37:09	1.2
  @@ -76,7 +76,7 @@
       }
   }
   
  -ap_status_t ap_create_tcp_socket(ap_context_t *cont, struct socket_t **new)
  +ap_status_t ap_create_tcp_socket(struct socket_t **new, ap_context_t *cont)
   {
       (*new) = (struct socket_t *)ap_palloc(cont, sizeof(struct socket_t));
   
  @@ -145,7 +145,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_accept(const struct socket_t *sock, struct socket_t **new)
  +ap_status_t ap_accept(struct socket_t **new, const struct socket_t *sock)
   {
       struct hostent *hptr;
       
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/network_io/os2/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockopt.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sockopt.c	1999/08/17 15:59:43	1.1
  +++ sockopt.c	1999/10/04 16:37:09	1.2
  @@ -162,7 +162,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_hostname(struct socket_t *sock, char **name)
  +ap_status_t ap_get_remote_hostname(char **name, struct socket_t *sock)
   {
       (*name) = ap_pstrdup(sock->cntxt, sock->remote_hostname);
       if (*name) {
  
  
  
  1.7       +3 -3      apache-2.0/src/lib/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- poll.c	1999/10/01 16:18:34	1.6
  +++ poll.c	1999/10/04 16:37:11	1.7
  @@ -67,13 +67,13 @@
   #ifdef HAVE_POLL    /* We can just use poll to do our socket polling. */
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setup_poll(ap_context_t *, ap_int32_t, ap_pollfd_t **)
  + * ap_status_t ap_setup_poll(ap_pollfd_t **, ap_context_t *, ap_int32_t)
    *    Setup the memory required for poll to operate properly.
    * arg 1) The context to operate on.
    * arg 2) The number of socket descriptors to be polled.
    * arg 3) The poll structure to be used. 
    */
  -ap_status_t ap_setup_poll(ap_context_t *cont, ap_int32_t num, struct pollfd_t **new)
  +ap_status_t ap_setup_poll(struct pollfd_t **new, ap_context_t *cont, ap_int32_t num)
   {
       (*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t));
       (*new)->sock = ap_palloc(cont, sizeof(struct socket_t) * num);
  @@ -437,7 +437,7 @@
   ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
   {
       if (pollfd != NULL) {
  -        return ap_get_userdata(pollfd->cntxt, key, &data);
  +        return ap_get_userdata(&data, pollfd->cntxt, key);
       }
       else {
           data = NULL;
  
  
  
  1.11      +9 -9      apache-2.0/src/lib/apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- sockets.c	1999/10/02 23:02:09	1.10
  +++ sockets.c	1999/10/04 16:37:13	1.11
  @@ -79,12 +79,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_create_tcp_socket(ap_context_t *, ap_socket_t **)
  + * ap_status_t ap_create_tcp_socket(ap_socket_t **, ap_context_t *)
    *    Create a socket for tcp communication.
    * arg 1) The context to use
    * arg 2) The new socket that has been setup. 
    */
  -ap_status_t ap_create_tcp_socket(ap_context_t *cont, struct socket_t **new)
  +ap_status_t ap_create_tcp_socket(struct socket_t **new, ap_context_t *cont)
   {
       (*new) = (struct socket_t *)ap_palloc(cont, sizeof(struct socket_t));
   
  @@ -243,14 +243,14 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_accept(ap_socket_t *, ap_socket_t **)
  + * ap_status_t ap_accept(ap_socket_t **, ap_socket_t *)
    *    Accept a new connection request
    * arg 1) The socket we are listening on 
    * arg 2) A copy of the socket that is connected to the socket that
    *        made the connection request.  This is the socket which should
    *        be used for all future communication.
    */
  -ap_status_t ap_accept(const struct socket_t *sock, struct socket_t **new)
  +ap_status_t ap_accept(struct socket_t **new, const struct socket_t *sock)
   {
       struct hostent *hptr;
       
  @@ -329,8 +329,8 @@
    */
   ap_status_t ap_get_socketdata(struct socket_t *sock, char *key, void *data)
   {
  -    if (sock != NULL) {
  -        return ap_get_userdata(sock->cntxt, key, &data);
  +    if (socket != NULL) {
  +        return ap_get_userdata(&data, sock->cntxt, key);
       }
       else {
           data = NULL;
  @@ -373,14 +373,14 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_put_os_sock(ap_context_t *, ap_socket_t **, ap_os_socket_t *)
  + * ap_status_t ap_put_os_sock(ap_socket_t **, ap_os_socket_t *, ap_context_t *)
    *    Convert a socket from the os specific type to the apr type
    * arg 1) The context to use.
    * arg 2) The socket to convert to.
    * arg 3) The socket we are converting to an apr type.
    */
  -ap_status_t ap_put_os_sock(ap_context_t *cont, struct socket_t **sock,
  -                            ap_os_sock_t *thesock)
  +ap_status_t ap_put_os_sock(struct socket_t **sock, ap_os_sock_t *thesock, 
  +                           ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/network_io/unix/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockopt.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sockopt.c	1999/10/01 16:18:35	1.4
  +++ sockopt.c	1999/10/04 16:37:13	1.5
  @@ -199,7 +199,7 @@
    * arg 1) The socket to examine.
    * arg 2) A buffer to store the hostname in.
    */
  -ap_status_t ap_get_remote_hostname(struct socket_t *sock, char **name)
  +ap_status_t ap_get_remote_hostname(char **name, struct socket_t *sock)
   {
       (*name) = ap_pstrdup(sock->cntxt, sock->remote_hostname);
       if (*name) {
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/network_io/win32/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/poll.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- poll.c	1999/09/22 17:30:36	1.2
  +++ poll.c	1999/10/04 16:37:16	1.3
  @@ -62,7 +62,7 @@
   #include <time.h>
   
   
  -ap_status_t ap_setup_poll(ap_context_t *cont, ap_int32_t num, struct pollfd_t **new)
  +ap_status_t ap_setup_poll(struct pollfd_t **new, ap_context_t *cont, ap_int32_t num)
   {
       (*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t) * num);
       if ((*new) == NULL) {
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockets.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sockets.c	1999/09/24 18:34:38	1.3
  +++ sockets.c	1999/10/04 16:37:16	1.4
  @@ -75,7 +75,7 @@
       }
   }
   
  -ap_status_t ap_create_tcp_socket(ap_context_t *cont, struct socket_t **new)
  +ap_status_t ap_create_tcp_socket(struct socket_t **new, ap_context_t *cont)
   {
       (*new) = (struct socket_t *)ap_palloc(cont, sizeof(struct socket_t));
   
  @@ -187,7 +187,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_accept(const struct socket_t *sock, struct socket_t **new)
  +ap_status_t ap_accept(struct socket_t **new, const struct socket_t *sock)
   {
       struct hostent *hptr;
       
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/network_io/win32/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockopt.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sockopt.c	1999/08/17 15:59:43	1.1
  +++ sockopt.c	1999/10/04 16:37:16	1.2
  @@ -134,7 +134,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_hostname(struct socket_t *sock, char **name)
  +ap_status_t ap_get_remote_hostname(char **name, struct socket_t *sock)
   {
       (*name) = ap_pstrdup(sock->cntxt, sock->remote_hostname);
       if (*name) {
  
  
  
  1.3       +5 -5      apache-2.0/src/lib/apr/shmem/shmem.c
  
  Index: shmem.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/shmem.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- shmem.c	1999/08/31 05:32:48	1.2
  +++ shmem.c	1999/10/04 16:37:19	1.3
  @@ -58,7 +58,7 @@
       ap_context_t *cntxt;
   }
   
  -ap_status_t ap_shm_create(ap_context_t *cont, ap_size_t size, const char *file, struct shmem_t **new)
  +ap_status_t ap_shm_create(struct shmem_t **new, ap_context_t *cont, ap_size_t size, const char *file)
   {
       MM *mm = mm_create(size, file);
   
  @@ -81,7 +81,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_shm_malloc(struct shmem_t *shared, ap_size_t size, void **entity)
  +ap_status_t ap_shm_malloc(void **entity, struct shmem_t *shared, ap_size_t size)
   {
       entity = mm_malloc(shared->mm, size);
       if (entity == NULL) {
  @@ -90,7 +90,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_shm_calloc(struct shmem_t *shared, ap_size_t size, void **entity)
  +ap_status_t ap_shm_calloc(void **entity, struct shmem_t *shared, ap_size_t size)
   {
       entity = mm_calloc(shared->mm, size);
       if (entity == NULL) {
  @@ -99,7 +99,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_shm_realloc(struct shmem_t *shared, ap_size_t size, void **entity)
  +ap_status_t ap_shm_realloc(void **entity, struct shmem_t *shared, ap_size_t size)
   {
       void *new;
   
  @@ -118,7 +118,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_shm_strdup(struct shmem_t *shared, const char *old, char **new)
  +ap_status_t ap_shm_strdup(char **new, struct shmem_t *shared, const char *old)
   {
       (*new) = mm_strdup(shared->mm, old);
       if ((*new) == NULL) {
  
  
  
  1.3       +3 -3      apache-2.0/src/lib/apr/shmem/unix/shmem.c
  
  Index: shmem.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/shmem.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- shmem.c	1999/08/31 05:32:49	1.2
  +++ shmem.c	1999/10/04 16:37:20	1.3
  @@ -86,7 +86,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_shm_malloc(struct shmem_t *shared, ap_size_t size, void **entity)
  +ap_status_t ap_shm_malloc(void **entity, struct shmem_t *shared, ap_size_t size)
   {
       entity = mm_malloc(shared->mm, size);
       if (entity == NULL) {
  @@ -105,7 +105,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_shm_realloc(struct shmem_t *shared, ap_size_t size, void **entity)
  +ap_status_t ap_shm_realloc(void **entity, struct shmem_t *shared, ap_size_t size)
   {
       void *new;
   
  @@ -124,7 +124,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_shm_strdup(struct shmem_t *shared, const char *old, char **new)
  +ap_status_t ap_shm_strdup(char **new, struct shmem_t *shared, const char *old)
   {
       (*new) = mm_strdup(shared->mm, old);
       if ((*new) == NULL) {
  
  
  
  1.5       +7 -8      apache-2.0/src/lib/apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	1999/09/14 13:37:25	1.4
  +++ Makefile.in	1999/10/04 16:37:21	1.5
  @@ -106,11 +106,10 @@
    $(INCDIR)/apr_errno.h
   htdigest.o: htdigest.c $(INCDIR)/apr_lib.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/hsregex.h $(INCDIR)/apr_md5.h
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_md5.h
   htpasswd.o: htpasswd.c $(INCDIR)/apr_signal.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr_config.h \
  - $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_file_io.h \
  - $(INCDIR)/hsregex.h
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_file_io.h
   logresolve.o: logresolve.c $(INCDIR)/apr_config.h
   rotatelogs.o: rotatelogs.c $(INCDIR)/apr_config.h
   server.o: server.c $(INCDIR)/apr_network_io.h \
  @@ -119,22 +118,22 @@
   suexec.o: suexec.c $(INCDIR)/apr_config.h suexec.h
   testargs.o: testargs.c $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr_config.h \
  - $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h
   testfile.o: testfile.c $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr_config.h \
  - $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h
   testproc.o: testproc.c $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_win.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + $(INCDIR)/apr_lib.h 
   testsig.o: testsig.c $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_win.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + $(INCDIR)/apr_lib.h
   testsock.o: testsock.c $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_win.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h
  + $(INCDIR)/apr_lib.h
   testthread.o: testthread.c $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr_config.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_win.h \
  
  
  
  1.5       +10 -10    apache-2.0/src/lib/apr/test/ab_apr.c
  
  Index: ab_apr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/ab_apr.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ab_apr.c	1999/09/14 13:37:25	1.4
  +++ ab_apr.c	1999/10/04 16:37:22	1.5
  @@ -443,7 +443,7 @@
       c->cbx = 0;
       c->gotheader = 0;
   
  -    if (ap_create_tcp_socket(cntxt, &c->aprsock) != APR_SUCCESS) {
  +    if (ap_create_tcp_socket(&c->aprsock, cntxt) != APR_SUCCESS) {
           err("Socket:");
       }
       if (ap_setport(c->aprsock, port) != APR_SUCCESS) {
  @@ -677,18 +677,18 @@
           fflush(stdout);
       }
   
  -    ap_make_time(cntxt, &now);
  +    ap_make_time(&now, cntxt);
   
       con = (struct connection *)malloc(concurrency * sizeof(struct connection));
       memset(con, 0, concurrency * sizeof(struct connection));
   
       stats = (struct data *)malloc(requests * sizeof(struct data));
  -    ap_setup_poll(cntxt, concurrency, &readbits);
  +    ap_setup_poll(&readbits, cntxt, concurrency);
   
       for (i = 0; i < concurrency; i++) {
  -        ap_make_time(cntxt, &con[i].start);
  -        ap_make_time(cntxt, &con[i].connect);
  -        ap_make_time(cntxt, &con[i].done);
  +        ap_make_time(&con[i].start, cntxt);
  +        ap_make_time(&con[i].connect, cntxt);
  +        ap_make_time(&con[i].done, cntxt); 
       }
   
       /* setup request */
  @@ -859,7 +859,7 @@
       ap_fileperms_t mode;
       ap_ssize_t length;
   
  -    if (ap_open(cntxt, pfile, APR_READ, mode, &postfd) != APR_SUCCESS) {
  +    if (ap_open(&postfd, cntxt, pfile, APR_READ, mode) != APR_SUCCESS) {
           printf("Invalid postfile name (%s)\n", pfile);
           return errno;
       }
  @@ -893,10 +893,10 @@
       trstring = "";
       tdstring = "bgcolor=white";
   
  -    ap_create_context(NULL, &cntxt);
  +    ap_create_context(&cntxt, NULL);
   
  -    ap_make_time(cntxt, &start);
  -    ap_make_time(cntxt, &endtime);
  +    ap_make_time(&start, cntxt);
  +    ap_make_time(&endtime, cntxt);
   
       optind = 1;
       while (ap_getopt(cntxt, argc, argv, "n:c:t:T:p:v:kVhwx:y:z:", &c) == APR_SUCCESS) {
  
  
  
  1.3       +2 -2      apache-2.0/src/lib/apr/test/abc.c
  
  Index: abc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/abc.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- abc.c	1999/09/14 13:37:25	1.2
  +++ abc.c	1999/10/04 16:37:23	1.3
  @@ -11,9 +11,9 @@
       int status = 0;
       ap_context_t *context;
   
  -    ap_create_context(NULL, &context); 
  +    ap_create_context(&context, NULL); 
   
  -    ap_open(context, argv[1], APR_READ, -1, &fd);
  +    ap_open(&fd, context, argv[1], APR_READ, -1);
       
       while (!status) {
           status = ap_getc(fd, &ch);
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/test/client.c
  
  Index: client.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/client.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- client.c	1999/09/14 13:37:26	1.3
  +++ client.c	1999/10/04 16:37:23	1.4
  @@ -70,14 +70,14 @@
       char datarecv[STRLEN];
   
       fprintf(stdout, "Creating context.......");
  -    if (ap_create_context(NULL, &context) != APR_SUCCESS) {
  +    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Something went wrong\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tClient:  Creating new socket.......");
  -    if (ap_create_tcp_socket(context, &sock) != APR_SUCCESS) {
  +    if (ap_create_tcp_socket(&sock, context) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't create socket\n");
           exit(-1);
       }
  
  
  
  1.5       +4 -4      apache-2.0/src/lib/apr/test/htdigest.c
  
  Index: htdigest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htdigest.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- htdigest.c	1999/09/14 13:37:26	1.4
  +++ htdigest.c	1999/10/04 16:37:23	1.5
  @@ -208,14 +208,14 @@
       char command[MAX_STRING_LEN];
       int found;
       
  -    ap_create_context(NULL, &cntxt);
  +    ap_create_context(&cntxt, NULL);
   
       tn = NULL;
       signal(SIGINT, (void (*)(int)) interrupted);
       if (argc == 5) {
   	if (strcmp(argv[1], "-c"))
   	    usage();
  -	if (ap_open(cntxt, argv[2], APR_WRITE | APR_CREATE, -1, &tfp) != APR_SUCCESS) {
  +	if (ap_open(&tfp, cntxt, argv[2], APR_WRITE | APR_CREATE, -1) != APR_SUCCESS) {
   	    fprintf(stderr, "Could not open passwd file %s for writing.\n",
   		    argv[2]);
   	    perror("ap_open");
  @@ -230,12 +230,12 @@
   	usage();
   
       tn = tmpnam(NULL);
  -    if (ap_open(cntxt, tn, APR_WRITE | APR_CREATE, -1, &tfp)!= APR_SUCCESS) {
  +    if (ap_open(&tfp, cntxt, tn, APR_WRITE | APR_CREATE, -1)!= APR_SUCCESS) {
   	fprintf(stderr, "Could not open temp file.\n");
   	exit(1);
       }
   
  -    if (ap_open(cntxt, argv[1], APR_READ, -1, &f) != APR_SUCCESS) {
  +    if (ap_open(&f, cntxt, argv[1], APR_READ, -1) != APR_SUCCESS) {
   	fprintf(stderr,
   		"Could not open passwd file %s for reading.\n", argv[1]);
   	fprintf(stderr, "Use -c option to create new one.\n");
  
  
  
  1.4       +4 -4      apache-2.0/src/lib/apr/test/server.c
  
  Index: server.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/server.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- server.c	1999/09/14 13:37:26	1.3
  +++ server.c	1999/10/04 16:37:23	1.4
  @@ -71,14 +71,14 @@
       char datarecv[STRLEN] = "Recv data test";
   
       fprintf(stdout, "Creating context.......");
  -    if (ap_create_context(NULL, &context) != APR_SUCCESS) {
  +    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Could not create a context\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Creating new socket.......");
  -    if (ap_create_tcp_socket(context, &sock) != APR_SUCCESS) {
  +    if (ap_create_tcp_socket(&sock, context) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't create socket\n");
           exit(-1);
       }
  @@ -117,7 +117,7 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Setting up socket for polling.......");
  -    ap_setup_poll(context, 1, &sdset);
  +    ap_setup_poll(&sdset, context, 1);
       ap_add_poll_socket(sdset, sock, APR_POLLIN);
       fprintf(stdout, "OK\n");
       
  @@ -136,7 +136,7 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Accepting a connection.......");
  -    if (ap_accept(sock, &sock2) != APR_SUCCESS) {
  +    if (ap_accept(&sock2, sock) != APR_SUCCESS) {
           ap_close_socket(sock);
           fprintf(stderr, "Could not accept connection.\n");
           exit(-1);
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/test/testargs.c
  
  Index: testargs.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testargs.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testargs.c	1999/09/14 13:37:26	1.2
  +++ testargs.c	1999/10/04 16:37:24	1.3
  @@ -69,7 +69,7 @@
       ap_context_t *context;
       ap_int32_t data;
   
  -    ap_create_context(NULL, &context);
  +    ap_create_context(&context, NULL);
   
       while (ap_getopt(context, argc, argv, "abc:d::", &data) == APR_SUCCESS) {
           switch(data) {
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/apr/test/testcontext.c
  
  Index: testcontext.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testcontext.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testcontext.c	1999/09/14 13:37:26	1.1
  +++ testcontext.c	1999/10/04 16:37:24	1.2
  @@ -72,7 +72,7 @@
       char *testdata;
       char *retdata;
   
  -    if (ap_create_context(NULL, &context) != APR_SUCCESS) {
  +    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't allocate context.");
           exit(-1);
       }
  @@ -81,7 +81,7 @@
   
       ap_set_userdata(context, testdata, "TEST", string_cleanup);    
   
  -    ap_get_userdata(context, "TEST", (void **)&retdata);
  +    ap_get_userdata((void **)&retdata, context, "TEST");
   
       if (!strcmp(testdata, retdata)) {
           fprintf(stdout, "User data is working ok\n");
  
  
  
  1.4       +10 -10    apache-2.0/src/lib/apr/test/testfile.c
  
  Index: testfile.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testfile.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- testfile.c	1999/09/14 13:37:26	1.3
  +++ testfile.c	1999/10/04 16:37:24	1.4
  @@ -77,11 +77,11 @@
       char *buf;
       char *str;
       char *filename = "test.fil";
  -    if (ap_create_context(NULL, &context) != APR_SUCCESS) {
  +    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't allocate context.");
           exit(-1);
       }
  -    if (ap_create_context(context, &cont2) != APR_SUCCESS) {
  +    if (ap_create_context(&cont2, context) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't allocate context.");
           exit(-1);
       }
  @@ -89,7 +89,7 @@
       fprintf(stdout, "Testing file functions.\n");
   
       fprintf(stdout, "\tOpening file.......");
  -    if (ap_open(context, filename, flag, APR_UREAD | APR_UWRITE | APR_GREAD, &thefile) != APR_SUCCESS) {
  +    if (ap_open(&thefile, context, filename, flag, APR_UREAD | APR_UWRITE | APR_GREAD) != APR_SUCCESS) {
           perror("Didn't open file");
           exit(-1);
       }
  @@ -102,7 +102,7 @@
           fprintf(stderr, "Bad file des\n");
           exit(-1);
       }
  -    ap_get_filename(thefile, &str);
  +    ap_get_filename(&str, thefile);
       if (strcmp(str, filename) != 0) {
           fprintf(stderr, "wrong filename\n");
           exit(-1);
  @@ -172,7 +172,7 @@
       }
       
       fprintf(stdout, "\tMaking sure it's gone.......");
  -    status = ap_open(context, filename, APR_READ, APR_UREAD | APR_UWRITE | APR_GREAD, &thefile);
  +    status = ap_open(&thefile, context, filename, APR_READ, APR_UREAD | APR_UWRITE | APR_GREAD);
       if (status == APR_SUCCESS) {
           fprintf(stderr, "I could open the file for some reason?\n");
           exit(-1);
  @@ -193,7 +193,7 @@
       ap_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
       ap_status_t stat;
     
  -    stat = ap_open(context, "testdel", flag, APR_UREAD | APR_UWRITE | APR_GREAD, &thefile);
  +    stat = ap_open(&thefile, context, "testdel", flag, APR_UREAD | APR_UWRITE | APR_GREAD);
       if (stat != APR_SUCCESS) {
            return stat;
       }
  @@ -206,7 +206,7 @@
           return stat;
       }
   
  -    stat = ap_open(context, "testdel", APR_READ, APR_UREAD | APR_UWRITE | APR_GREAD, &thefile);
  +    stat = ap_open(&thefile, context, "testdel", APR_READ, APR_UREAD | APR_UWRITE | APR_GREAD);
       if (stat == APR_SUCCESS) {
           return stat;
       }
  @@ -233,7 +233,7 @@
           fprintf(stdout, "OK\n");
       }
   
  -    if (ap_open(context, "testdir/testfile", APR_READ | APR_WRITE | APR_CREATE, APR_UREAD | APR_UWRITE | APR_UEXECUTE, &file) != APR_SUCCESS) {;
  +    if (ap_open(&file, context, "testdir/testfile", APR_READ | APR_WRITE | APR_CREATE, APR_UREAD | APR_UWRITE | APR_UEXECUTE) != APR_SUCCESS) {;
           return -1;
       }
   
  @@ -242,7 +242,7 @@
   	ap_close(file);
   
       fprintf(stdout, "\tOpening Directory.......");
  -    if (ap_opendir(context, "testdir", &temp) != APR_SUCCESS) {
  +    if (ap_opendir(&temp, context, "testdir") != APR_SUCCESS) {
           fprintf(stderr, "Could not open directory\n");
           return -1;
       }
  @@ -269,7 +269,7 @@
               fprintf(stderr, "Error reading directory testdir"); 
               return -1;
           }
  -        ap_get_dir_filename(temp, &fname);
  +        ap_get_dir_filename(&fname, temp);
       } while (fname[0] == '.');
       if (strcmp(fname, "testfile")) {
           fprintf(stderr, "Got wrong file name %s\n", fname);
  
  
  
  1.3       +3 -3      apache-2.0/src/lib/apr/test/testproc.c
  
  Index: testproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testproc.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testproc.c	1999/09/14 13:37:26	1.2
  +++ testproc.c	1999/10/04 16:37:24	1.3
  @@ -79,7 +79,7 @@
       char *args[3];
       char *teststr;
   
  -    ap_create_context(NULL, &context);
  +    ap_create_context(&context, NULL);
   
       teststr = ap_pstrdup(context, "Whooo Hoooo\0");
   
  @@ -96,7 +96,7 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "Creating procattr.......");
  -    if (ap_createprocattr_init(context, &attr) != APR_SUCCESS) {
  +    if (ap_createprocattr_init(&attr, context) != APR_SUCCESS) {
           fprintf(stderr, "Could not create attr\n");
           exit(-1);;
       }
  @@ -135,7 +135,7 @@
       fprintf(stdout, "OK.\n");
   
       fprintf(stdout, "Grabbing child's stdout.......");
  -    if (ap_get_childout(newproc, &testfile) != APR_SUCCESS) {
  +    if (ap_get_childout(&testfile, newproc) != APR_SUCCESS) {
           fprintf(stderr, "Could not get child's stdout\n");
           exit(-1);
       }
  
  
  
  1.3       +2 -2      apache-2.0/src/lib/apr/test/testsig.c
  
  Index: testsig.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testsig.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testsig.c	1999/09/14 13:37:26	1.2
  +++ testsig.c	1999/10/04 16:37:24	1.3
  @@ -82,7 +82,7 @@
   
       ap_initialize();
   
  -    ap_create_context(NULL, &context);
  +    ap_create_context(&context, NULL);
   
       if (argc > 1) {
   
  @@ -101,7 +101,7 @@
       }
       fprintf(stdout, "OK\n");
   
  -    if (ap_createprocattr_init(context, &attr) != APR_SUCCESS) {
  +    if (ap_createprocattr_init(&attr, context) != APR_SUCCESS) {
           fprintf(stderr, "Could not create attr\n");
           exit(-1);;
       }
  
  
  
  1.3       +3 -3      apache-2.0/src/lib/apr/test/testsock.c
  
  Index: testsock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testsock.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testsock.c	1999/09/14 13:37:27	1.2
  +++ testsock.c	1999/10/04 16:37:25	1.3
  @@ -75,7 +75,7 @@
       char *args[2];
   
       fprintf(stdout, "Creating context.......");
  -    if (ap_create_context(NULL, &context) != APR_SUCCESS) {
  +    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Could not create context\n");
           exit(-1);
       }
  @@ -87,8 +87,8 @@
       fprintf(stdout, "server and client by yourself.\n");
   
       fprintf(stdout, "Creating children to run network tests.......\n");
  -    s1 = ap_createprocattr_init(context, &attr1);
  -    s2 = ap_createprocattr_init(context, &attr2);
  +    s1 = ap_createprocattr_init(&attr1, context);
  +    s2 = ap_createprocattr_init(&attr2, context);
   
       if (s1 != APR_SUCCESS || s2 != APR_SUCCESS) {
           fprintf(stderr, "Problem creating proc attrs\n");
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/test/testthread.c
  
  Index: testthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testthread.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- testthread.c	1999/09/20 21:33:09	1.3
  +++ testthread.c	1999/10/04 16:37:25	1.4
  @@ -129,7 +129,7 @@
       ap_status_t s4;
   
       fprintf(stdout, "Initializing the context......."); 
  -    if (ap_create_context(NULL, &context) != APR_SUCCESS) {
  +    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "could not initialize\n");
           exit(-1);
       }
  
  
  
  1.3       +3 -3      apache-2.0/src/lib/apr/test/testtime.c
  
  Index: testtime.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testtime.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testtime.c	1999/09/14 13:37:27	1.2
  +++ testtime.c	1999/10/04 16:37:25	1.3
  @@ -70,7 +70,7 @@
       ap_int64_t t1, t2;
   
       fprintf(stdout, "Creating context.......");
  -    if (ap_create_context(NULL, &context) != APR_SUCCESS) {
  +    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "could not create context\n");
           exit(-1);
       }
  @@ -79,7 +79,7 @@
       fprintf(stdout, "Testing Time functions.\n");
   
       fprintf(stdout, "\tMaking new time variable.......");
  -    if (ap_make_time(context, &time) != APR_SUCCESS) {
  +    if (ap_make_time(&time, context) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't allocate memory\n");
           exit(-1);
       }
  @@ -99,7 +99,7 @@
       }
       fprintf(stdout, "OK\n");
   
  -    ap_make_time(context, &time2);
  +    ap_make_time(&time2, context);
       fprintf(stdout, "\tGetting the number of seconds.......");
       if (ap_get_sec(time, &rv) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't get the seconds\n");
  
  
  
  1.4       +5 -5      apache-2.0/src/lib/apr/threadproc/beos/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/proc.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- proc.c	1999/09/10 14:00:46	1.3
  +++ proc.c	1999/10/04 16:37:30	1.4
  @@ -69,7 +69,7 @@
   	char ** envp;
   };
   
  -ap_status_t ap_createprocattr_init(ap_context_t *cont, struct procattr_t **new)
  +ap_status_t ap_createprocattr_init(struct procattr_t **new, ap_context_t *cont)
   {
       (*new) = (struct procattr_t *)ap_palloc(cont, 
                 sizeof(struct procattr_t));
  @@ -146,7 +146,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_fork(ap_context_t *cont, struct proc_t **proc)
  +ap_status_t ap_fork(struct proc_t **proc, ap_context_t *cont)
   {
       int pid;
       
  @@ -235,19 +235,19 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_childin(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childin(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_in; 
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_childout(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childout(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_out;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_childerr(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childerr(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_err; 
       return APR_SUCCESS;
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/threadproc/beos/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/procsup.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- procsup.c	1999/09/10 14:00:46	1.1
  +++ procsup.c	1999/10/04 16:37:30	1.2
  @@ -62,7 +62,7 @@
   #include "apr_general.h"
   #include "apr_lib.h"
   
  -ap_status_t ap_detach(ap_context_t *cont, struct proc_t **new)
  +ap_status_t ap_detach(struct proc_t **new, ap_context_t *cont)
   {
       int x;
   
  
  
  
  1.3       +2 -2      apache-2.0/src/lib/apr/threadproc/beos/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/thread.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- thread.c	1999/09/14 13:37:29	1.2
  +++ thread.c	1999/10/04 16:37:31	1.3
  @@ -58,7 +58,7 @@
   #include "apr_general.h"
   
   
  -ap_status_t ap_create_threadattr(ap_context_t *cont, struct threadattr_t **new)
  +ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
   {
       ap_status_t stat;
     
  @@ -120,7 +120,7 @@
   	else
   	    temp = B_NORMAL_PRIORITY;
   
  -    stat = ap_create_context(cont, &(*new)->cntxt);
  +    stat = ap_create_context(&(*new)->cntxt, cont);
       if (stat != APR_SUCCESS) {
           return stat;
       }
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- threadpriv.c	1999/08/17 15:59:49	1.1
  +++ threadpriv.c	1999/10/04 16:37:31	1.2
  @@ -86,7 +86,7 @@
       return APR_ENOMEM;
   }
   
  -ap_status_t ap_get_thread_private(struct threadkey_t *key, void **new)
  +ap_status_t ap_get_thread_private(void **new, struct threadkey_t *key)
   {
   	thread_id tid;
   	int i, index=0;
  
  
  
  1.3       +5 -5      apache-2.0/src/lib/apr/threadproc/os2/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- proc.c	1999/08/28 08:05:45	1.2
  +++ proc.c	1999/10/04 16:37:37	1.3
  @@ -68,7 +68,7 @@
   #define INCL_DOS
   #include <os2.h>
   
  -ap_status_t ap_createprocattr_init(ap_context_t *cont, struct procattr_t **new)
  +ap_status_t ap_createprocattr_init(struct procattr_t **new, ap_context_t *cont)
   {
       (*new) = (struct procattr_t *)ap_palloc(cont, 
                 sizeof(struct procattr_t));
  @@ -130,7 +130,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_fork(ap_context_t *cont, struct proc_t **proc)
  +ap_status_t ap_fork(struct proc_t **proc, ap_context_t *cont)
   {
       int pid;
       
  @@ -271,19 +271,19 @@
   
   
   
  -ap_status_t ap_get_childin(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childin(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_in;
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_get_childout(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childout(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_out; 
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_childerr(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childerr(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_err; 
       return APR_SUCCESS;
  
  
  
  1.3       +2 -2      apache-2.0/src/lib/apr/threadproc/os2/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/thread.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- thread.c	1999/09/14 13:37:30	1.2
  +++ thread.c	1999/10/04 16:37:38	1.3
  @@ -61,7 +61,7 @@
   #define INCL_DOS
   #include <os2.h>
   
  -ap_status_t ap_create_threadattr(ap_context_t *cont, struct threadattr_t **new)
  +ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
   {
       (*new) = (struct threadattr_t *)ap_palloc(cont, sizeof(struct threadattr_t));
   
  @@ -117,7 +117,7 @@
       thread->attr = attr;
       thread->func = func;
       thread->data = data;
  -    stat = ap_create_context(cont, &thread->cntxt);
  +    stat = ap_create_context(&thread->cntxt, cont);
       
       if (stat != APR_SUCCESS) {
           return stat;
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- threadpriv.c	1999/08/17 15:59:50	1.1
  +++ threadpriv.c	1999/10/04 16:37:38	1.2
  @@ -73,7 +73,7 @@
       return os2errno(DosAllocThreadLocalMemory(1, &((*key)->key)));
   }
   
  -ap_status_t ap_get_thread_private(struct threadkey_t *key, void **new)
  +ap_status_t ap_get_thread_private(void **new, struct threadkey_t *key)
   {
       (*new) = (void *)*(key->key);
       return APR_SUCCESS;
  
  
  
  1.4       +20 -20    apache-2.0/src/lib/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- proc.c	1999/10/01 16:18:37	1.3
  +++ proc.c	1999/10/04 16:37:39	1.4
  @@ -67,12 +67,12 @@
   #include <unistd.h>
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_createprocattr_init(ap_context_t *, ap_procattr_t **)
  + * ap_status_t ap_createprocattr_init(ap_procattr_t **, ap_context_t *)
    *    Create and initialize a new procattr variable 
    * arg 1) The context to use
    * arg 2) The newly created procattr. 
    */
  -ap_status_t ap_createprocattr_init(ap_context_t *cont, struct procattr_t **new)
  +ap_status_t ap_createprocattr_init(struct procattr_t **new, ap_context_t *cont)
   {
       (*new) = (struct procattr_t *)ap_palloc(cont, 
                 sizeof(struct procattr_t));
  @@ -107,20 +107,20 @@
   {
       ap_status_t status;
       if (in) {
  -        if ((status = ap_create_pipe(attr->cntxt, &attr->child_in, 
  -                            &attr->parent_in)) != APR_SUCCESS) {
  +        if ((status = ap_create_pipe(&attr->child_in, &attr->parent_in, 
  +                                   attr->cntxt)) != APR_SUCCESS) {
               return status;
           }
       } 
       if (out) {
  -        if ((status = ap_create_pipe(attr->cntxt, &attr->parent_out, 
  -                            &attr->child_out)) != APR_SUCCESS) {
  +        if ((status = ap_create_pipe(&attr->parent_out, &attr->child_out, 
  +                                   attr->cntxt)) != APR_SUCCESS) {
               return status;
           }
       } 
       if (err) {
  -        if ((status = ap_create_pipe(attr->cntxt, &attr->parent_err, 
  -                            &attr->child_err)) != APR_SUCCESS) {
  +        if ((status = ap_create_pipe(&attr->parent_err, &attr->child_err, 
  +                                   attr->cntxt)) != APR_SUCCESS) {
               return status;
           }
       } 
  @@ -173,13 +173,13 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_fork_detach(ap_context_t *, ap_proc_t **) 
  + * ap_status_t ap_fork_detach(ap_proc_t **, ap_context_t *) 
    *    This is currently the only non-portable call in APR.  This executes
    *    a standard unix fork.
    * arg 1) The context to use. 
    * arg 2) The resulting process handle. 
    */
  -ap_status_t ap_fork(ap_context_t *cont, struct proc_t **proc)
  +ap_status_t ap_fork(struct proc_t **proc, ap_context_t *cont)
   {
       int pid;
       
  @@ -271,13 +271,13 @@
               }
               newargs[i + 3] = NULL;
               if (attr->detached) {
  -                ap_detach(attr->cntxt, &pgrp);
  +                ap_detach(&pgrp, attr->cntxt);
               }
               execve(SHELL_PATH, newargs, env);
           }
           else {
               if (attr->detached) {
  -                ap_detach(attr->cntxt, &pgrp);
  +                ap_detach(&pgrp, attr->cntxt);
               }
               execve(progname, args, env);
           }
  @@ -300,36 +300,36 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_childin(ap_proc_t *, ap_file_t **) 
  + * ap_status_t ap_get_childin(ap_file_t **, ap_proc_t *) 
    *    Get the file handle that is assocaited with a child's stdin.
    * arg 1) The process handle that corresponds to the desired child process 
    * arg 2) The returned file handle. 
    */
  -ap_status_t ap_get_childin(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childin(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_in;
       return APR_SUCCESS; 
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_childout(ap_proc_t *, ap_file_t **) 
  + * ap_status_t ap_get_childout(ap_file_t **, ap_proc_t *) 
    *    Get the file handle that is assocaited with a child's stdout.
    * arg 1) The process handle that corresponds to the desired child process 
    * arg 2) The returned file handle. 
    */
  -ap_status_t ap_get_childout(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childout(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_out; 
       return APR_SUCCESS;
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_childerr(ap_proc_t *, ap_file_t **) 
  + * ap_status_t ap_get_childerr(ap_file_t **, ap_proc_t *) 
    *    Get the file handle that is assocaited with a child's stderr.
    * arg 1) The process handle that corresponds to the desired child process 
    * arg 2) The returned file handle. 
    */
  -ap_status_t ap_get_childerr(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childerr(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_err; 
       return APR_SUCCESS;
  @@ -394,8 +394,8 @@
    * arg 2) The apr proc we are converting to.
    * arg 3) The os specific proc to convert
    */
  -ap_status_t ap_put_os_proc(ap_context_t *cont, struct proc_t **proc,
  -                           ap_os_proc_t *theproc)
  +ap_status_t ap_put_os_proc(struct proc_t **proc, ap_os_proc_t *theproc, 
  +                           ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/threadproc/unix/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- procsup.c	1999/09/14 13:37:31	1.3
  +++ procsup.c	1999/10/04 16:37:40	1.4
  @@ -68,7 +68,7 @@
    * arg 1) The context to use if it is needed.
    * arg 2) The new process handler
    */
  -ap_status_t ap_detach(ap_context_t *cont, struct proc_t **new)
  +ap_status_t ap_detach(struct proc_t **new, ap_context_t *cont)
   {
       int x;
   
  @@ -141,7 +141,7 @@
   ap_status_t ap_get_procdata(struct proc_t *proc, char *key, void *data)
   {
       if (proc != NULL) {
  -        return ap_get_userdata(proc->cntxt, key, &data);
  +        return ap_get_userdata(&data, proc->cntxt, key);
       }
       else {
           data = NULL;
  
  
  
  1.4       +7 -7      apache-2.0/src/lib/apr/threadproc/unix/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- thread.c	1999/09/14 13:37:31	1.3
  +++ thread.c	1999/10/04 16:37:40	1.4
  @@ -61,12 +61,12 @@
   
   #ifdef HAVE_PTHREAD_H
   /* ***APRDOC********************************************************
  - * ap_status_t ap_create_threadattr(ap_context_t *, ap_threadattr_t **)
  + * ap_status_t ap_create_threadattr(ap_threadattr_t **, ap_context_t *)
    *    Create and initialize a new threadattr variable
    * arg 1) The context to use
    * arg 2) The newly created threadattr.
    */
  -ap_status_t ap_create_threadattr(ap_context_t *cont, struct threadattr_t **new)
  +ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
   {
       ap_status_t stat;
     
  @@ -157,7 +157,7 @@
       else
           temp = NULL;
       
  -    stat = ap_create_context(cont, &(*new)->cntxt);
  +    stat = ap_create_context(&(*new)->cntxt, cont);
       if (stat != APR_SUCCESS) {
           return stat;
       }
  @@ -227,7 +227,7 @@
   ap_status_t ap_get_threaddata(struct thread_t *thread, char *key, void *data)
   {
       if (thread != NULL) {
  -        return ap_get_userdata(thread->cntxt, key, &data);
  +        return ap_get_userdata(&data, thread->cntxt, key);
       }
       else {
           data = NULL;
  @@ -276,8 +276,8 @@
    * arg 2) The apr thread we are converting to.
    * arg 3) The os specific thread to convert
    */
  -ap_status_t ap_put_os_thread(ap_context_t *cont, struct thread_t **thd,
  -                             ap_os_thread_t *thethd)
  +ap_status_t ap_put_os_thread(struct thread_t **thd, ap_os_thread_t *thethd, 
  +                             ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  @@ -291,7 +291,7 @@
   }
   #else
       /* No pthread.h, no threads for right now.*/
  -ap_status_t ap_create_threadattr(ap_context_t *cont, struct threadattr_t **new)
  +ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
   {
       *new = NULL;
       return APR_SUCCESS;
  
  
  
  1.4       +6 -6      apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- threadpriv.c	1999/09/14 13:37:34	1.3
  +++ threadpriv.c	1999/10/04 16:37:40	1.4
  @@ -88,12 +88,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_thread_private(ap_key_t *, void **)
  + * ap_status_t ap_get_thread_private(void **, ap_key_t *)
    *    Get a pointer to the thread private memory
    * arg 1) The handle for the desired thread private memory 
    * arg 2) The data stored in private memory 
    */
  -ap_status_t ap_get_thread_private(struct threadkey_t *key, void **new)
  +ap_status_t ap_get_thread_private(void **new, struct threadkey_t *key)
   {
       (*new) = pthread_getspecific(key->key);
       return APR_SUCCESS;
  @@ -139,7 +139,7 @@
   ap_status_t ap_get_threadkeydata(struct threadkey_t *threadkey, char *key, void *data)
   {
       if (threadkey != NULL) {
  -        return ap_get_userdata(threadkey->cntxt, key, &data);
  +        return ap_get_userdata(&data, threadkey->cntxt, key);
       }
       else {
           data = NULL;
  @@ -190,8 +190,8 @@
    * arg 2) The apr handle we are converting to.
    * arg 3) The os specific handle to convert
    */
  -ap_status_t ap_put_os_threadkey(ap_context_t *cont, struct threadkey_t **key,
  -                                ap_os_threadkey_t *thekey)
  +ap_status_t ap_put_os_threadkey(struct threadkey_t **key, 
  +                                ap_os_threadkey_t *thekey, ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  @@ -211,7 +211,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_thread_private(struct threadkey_t *key, void **new)
  +ap_status_t ap_get_thread_private(void **new, struct threadkey_t *key)
   {
       (*new) = NULL;
       return APR_SUCCESS;
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/threadproc/unix/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadproc.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- threadproc.h	1999/08/31 05:32:53	1.2
  +++ threadproc.h	1999/10/04 16:37:40	1.3
  @@ -99,7 +99,7 @@
   /*This will move to ap_threadproc.h in time, but I need to figure it out
    * on windows first.  :)
    */
  -ap_status_t ap_detach(ap_context_t *, struct proc_t **);
  +ap_status_t ap_detach(struct proc_t **, ap_context_t *);
   
   #endif  /* ! THREAD_PROC_H */
   
  
  
  
  1.3       +4 -4      apache-2.0/src/lib/apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- proc.c	1999/09/22 17:46:04	1.2
  +++ proc.c	1999/10/04 16:37:42	1.3
  @@ -66,7 +66,7 @@
   #include <string.h>
   #include <process.h>
   
  -ap_status_t ap_createprocattr_init(ap_context_t *cont, struct procattr_t **new)
  +ap_status_t ap_createprocattr_init(struct procattr_t **new, ap_context_t *cont)
   {
       (*new) = (struct procattr_t *)ap_palloc(cont, 
                 sizeof(struct procattr_t));
  @@ -296,19 +296,19 @@
   	return GetLastError();
   }
   
  -ap_status_t ap_get_childin(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childin(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_in;
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_get_childout(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childout(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_out; 
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_childerr(struct proc_t *proc, ap_file_t **new)
  +ap_status_t ap_get_childerr(ap_file_t **new, struct proc_t *proc)
   {
       (*new) = proc->attr->parent_err; 
       return APR_SUCCESS;
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/threadproc/win32/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- thread.c	1999/09/22 17:46:04	1.3
  +++ thread.c	1999/10/04 16:37:42	1.4
  @@ -61,7 +61,7 @@
   #include <process.h>
   
   
  -ap_status_t ap_create_threadattr(ap_context_t *cont, struct threadattr_t **new)
  +ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
   {
       (*new) = (struct threadattr_t *)ap_palloc(cont, 
                 sizeof(struct threadattr_t));
  @@ -103,7 +103,7 @@
   
       (*new)->cntxt = cont;
       
  -    stat = ap_create_context(cont, &(*new)->cntxt);
  +    stat = ap_create_context(&(*new)->cntxt, cont);
       if (stat != APR_SUCCESS) {
           return stat;
       }
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- threadpriv.c	1999/09/22 17:46:05	1.2
  +++ threadpriv.c	1999/10/04 16:37:43	1.3
  @@ -67,7 +67,7 @@
   	return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_thread_private(struct threadkey_t *key, void **new)
  +ap_status_t ap_get_thread_private(void **new, struct threadkey_t *key)
   {
       if ((*new) = TlsGetValue(key->key)) {
           return APR_SUCCESS;
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/time/os2/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/os2/time.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- time.c	1999/08/17 15:59:53	1.1
  +++ time.c	1999/10/04 16:37:45	1.2
  @@ -61,7 +61,7 @@
   #include <errno.h>
   #include <string.h>
   
  -ap_status_t ap_make_time(ap_context_t *cont, struct atime_t **new)
  +ap_status_t ap_make_time(struct atime_t **new, ap_context_t *cont)
   {
       (*new) = (struct atime_t *)ap_palloc(cont, sizeof(struct atime_t));
   
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/time/unix/access.c
  
  Index: access.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/access.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- access.c	1999/10/01 16:18:40	1.3
  +++ access.c	1999/10/04 16:37:45	1.4
  @@ -343,7 +343,7 @@
   ap_status_t ap_get_timedata(struct atime_t *atime, char *key, void *data)
   {
       if (atime != NULL) {
  -        return ap_get_userdata(atime->cntxt, key, &data);
  +        return ap_get_userdata(&data, atime->cntxt, key);
       }
       else {
           data = NULL;
  
  
  
  1.4       +6 -6      apache-2.0/src/lib/apr/time/unix/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/time.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- time.c	1999/09/12 11:12:54	1.3
  +++ time.c	1999/10/04 16:37:46	1.4
  @@ -68,7 +68,7 @@
    * arg 1) The context to operate on.
    * arg 2) The new time entity to create.
    */
  -ap_status_t ap_make_time(ap_context_t *cont, struct atime_t **new)
  +ap_status_t ap_make_time(struct atime_t **new, ap_context_t *cont)
   {
       (*new) = (struct atime_t *)ap_palloc(cont, sizeof(struct atime_t));
   
  @@ -162,12 +162,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_os_time(ap_time_t *, ap_os_time_t **)
  + * ap_status_t ap_get_os_time(ap_os_time_t **, ap_time_t *)
    *    Convert from apr time type to OS specific time value
    * arg 1) The time value to convert.
    * arg 2) The OS specific value to convert to.
    */
  -ap_status_t ap_get_os_time(struct atime_t *thetime, ap_os_time_t **atime)
  +ap_status_t ap_get_os_time(ap_os_time_t **atime, struct atime_t *thetime)
   {
       if (thetime == NULL) {
           return APR_ENOTIME;
  @@ -180,14 +180,14 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_put_os_time(ap_context_t *, ap_time_t **, ap_os_time_t *)
  + * ap_status_t ap_put_os_time(ap_time_t **, ap_os_time_t *, ap_context_t *)
    *    Convert to apr time type from OS specific time value
    * arg 1) The context to use.
    * arg 2) The time value to convert to.
    * arg 3) The OS specific value to convert.
    */
  -ap_status_t ap_put_os_time(ap_context_t *cont, struct atime_t **thetime, 
  -                           ap_os_time_t *atime)
  +ap_status_t ap_put_os_time(struct atime_t **thetime, ap_os_time_t *atime, 
  +                           ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/apr/time/win32/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/time.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- time.c	1999/08/17 15:59:53	1.1
  +++ time.c	1999/10/04 16:37:48	1.2
  @@ -62,7 +62,7 @@
   #include <errno.h>
   #include <string.h>
   
  -ap_status_t ap_make_time(ap_context_t *cont, struct atime_t **new)
  +ap_status_t ap_make_time(struct atime_t **new, ap_context_t *cont)
   {
       (*new) = (struct atime_t *)ap_palloc(cont, sizeof(struct atime_t));
   
  @@ -111,7 +111,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_time(struct atime_t *thetime, ap_os_time_t **atime)
  +ap_status_t ap_get_os_time(ap_os_time_t **atime, struct atime_t *thetime)
   {
       if (thetime == NULL) {
           return APR_ENOTIME;
  
  
  
  1.6       +1 -1      apache-2.0/src/main/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- buff.c	1999/09/24 18:58:30	1.5
  +++ buff.c	1999/10/04 16:37:49	1.6
  @@ -938,7 +938,7 @@
       BUFF *fb;
       ap_status_t rv;
       ap_file_t *file;
  -    rv = ap_open(a, name, flg, 0, &file);
  +    rv = ap_open(&file, a, name, flg, 0);
       if ((rv != APR_SUCCESS) || (file == NULL)) {
           return NULL;
       }
  
  
  
  1.11      +1 -1      apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- http_config.c	1999/09/08 14:15:42	1.10
  +++ http_config.c	1999/10/04 16:37:50	1.11
  @@ -1251,7 +1251,7 @@
       s->server_admin = DEFAULT_ADMIN;
       s->server_hostname = NULL;
       s->error_fname = DEFAULT_ERRORLOG;
  -    ap_put_os_file(p, &s->error_log, &errfile);
  +    ap_put_os_file(&s->error_log, &errfile, p);
       s->loglevel = DEFAULT_LOGLEVEL;
       s->srm_confname = RESOURCE_CONFIG_FILE;
       s->access_confname = ACCESS_CONFIG_FILE;
  
  
  
  1.14      +2 -2      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- http_core.c	1999/09/14 13:37:38	1.13
  +++ http_core.c	1999/10/04 16:37:51	1.14
  @@ -399,7 +399,7 @@
       elts = (void **)sec->elts;
   
       /* we have to allocate tmp space to do a stable sort */
  -    ap_create_context(p, &tmp);
  +    ap_create_context(&tmp, p);
       sortbin = ap_palloc(tmp, sec->nelts * sizeof(*sortbin));
       for (i = 0; i < nelts; ++i) {
   	sortbin[i].orig_index = i;
  @@ -2515,7 +2515,7 @@
           return METHOD_NOT_ALLOWED;
       }
   	
  -    if (ap_open (r->pool, r->filename, APR_READ | APR_BINARY, 0, &fd) != APR_SUCCESS) {
  +    if (ap_open (&fd, r->pool, r->filename, APR_READ | APR_BINARY, 0) != APR_SUCCESS) {
           ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		     "file permissions deny server access: %s", r->filename);
           return FORBIDDEN;
  
  
  
  1.7       +5 -5      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- http_log.c	1999/09/08 14:15:43	1.6
  +++ http_log.c	1999/10/04 16:37:52	1.7
  @@ -209,7 +209,7 @@
   	}
   
           dummyno = fileno(dummy);
  -	ap_put_os_file(p, &s->error_log, &dummyno);
  +	ap_put_os_file(&s->error_log, &dummyno, p);
       }
   
   #ifdef HAVE_SYSLOG
  @@ -236,8 +236,8 @@
       else {
   	fname = ap_server_root_relative(p, s->error_fname);
   	/*  Change to AP funcs. */
  -        if (ap_open(p, fname, APR_BUFFERED | APR_APPEND | APR_READ | APR_WRITE, 
  -                      APR_OS_DEFAULT, &s->error_log) != APR_SUCCESS) {
  +        if (ap_open(&s->error_log, p, fname, APR_BUFFERED | APR_APPEND | 
  +                    APR_READ | APR_WRITE, APR_OS_DEFAULT) != APR_SUCCESS) {
               perror("fopen");
               fprintf(stderr, "%s: could not open error log file %s.\n",
   		    ap_server_argv0, fname);
  @@ -321,7 +321,7 @@
   	if (((level & APLOG_LEVELMASK) != APLOG_NOTICE) &&
   	    ((level & APLOG_LEVELMASK) > DEFAULT_LOGLEVEL))
   	    return;
  -	ap_put_os_file(NULL, &logf, &errfileno);
  +	ap_put_os_file(&logf, &errfileno, NULL);
       }
       else if (s->error_log) {
   	/*
  @@ -773,7 +773,7 @@
       pl = ap_palloc(p, sizeof (*pl));
       pl->p = p;
       dummyno = fileno(dummy);
  -    ap_put_os_file(p, &pl->write_f, &dummyno);
  +    ap_put_os_file(&pl->write_f, &dummyno, p);
   
       return pl;
   }
  
  
  
  1.8       +6 -6      apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- http_main.c	1999/09/14 13:37:38	1.7
  +++ http_main.c	1999/10/04 16:37:52	1.8
  @@ -267,10 +267,10 @@
       ap_util_init();
       ap_util_uri_init();
   
  -    ap_create_context(NULL, &pglobal);
  +    ap_create_context(&pglobal, NULL);
       g_pHookPool=pglobal;
   
  -    ap_create_context(pglobal, &pcommands);
  +    ap_create_context(&pcommands, pglobal);
       ap_server_pre_read_config  = ap_make_array(pcommands, 1, sizeof(char *));
       ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
       ap_server_config_defines   = ap_make_array(pcommands, 1, sizeof(char *));
  @@ -317,9 +317,9 @@
   	}
       }
   
  -    ap_create_context(pglobal, &pconf);
  -    ap_create_context(pglobal, &plog);
  -    ap_create_context(pconf, &ptemp);
  +    ap_create_context(&pconf, pglobal);
  +    ap_create_context(&plog, pglobal);
  +    ap_create_context(&ptemp, pconf);
   
       /* for legacy reasons, we read the configuration twice before
   	we actually serve any requests */
  @@ -340,7 +340,7 @@
   
       for (;;) {
   	ap_clear_pool(pconf);
  -	ap_create_context(pconf, &ptemp);
  +	ap_create_context(&ptemp, pconf);
   	ap_server_root = def_server_root;
   	ap_run_pre_config(pconf, plog, ptemp);
   	server_conf = ap_read_config(pconf, ptemp, confname);
  
  
  
  1.17      +1 -1      apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- http_protocol.c	1999/09/14 13:37:38	1.16
  +++ http_protocol.c	1999/10/04 16:37:53	1.17
  @@ -927,7 +927,7 @@
       const char *expect;
       int access_status;
   
  -    ap_create_context(conn->pool, &p);
  +    ap_create_context(&p, conn->pool);
       r = ap_pcalloc(p, sizeof(request_rec));
       r->pool            = p;
       r->connection      = conn;
  
  
  
  1.6       +1 -1      apache-2.0/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- http_request.c	1999/09/14 13:37:39	1.5
  +++ http_request.c	1999/10/04 16:37:53	1.6
  @@ -740,7 +740,7 @@
       ap_context_t *rrp;
       request_rec *rr;
       
  -    ap_create_context(r->pool, &rrp);
  +    ap_create_context(&rrp, r->pool);
       rr = ap_pcalloc(rrp, sizeof(request_rec));
       rr->pool = rrp;
       return rr;
  
  
  
  1.10      +1 -1      apache-2.0/src/main/listen.c
  
  Index: listen.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/listen.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- listen.c	1999/09/24 22:01:21	1.9
  +++ listen.c	1999/10/04 16:37:54	1.10
  @@ -176,7 +176,7 @@
       /* XXX - We need to deal with freeing this structure properly. */
       new = malloc(sizeof(ap_listen_rec));
       new->active = 0;
  -    if (ap_create_tcp_socket(NULL, &new->sd) != APR_SUCCESS) {
  +    if (ap_create_tcp_socket(&new->sd, NULL) != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_CRIT, NULL,
                    "make_sock: failed to get a socket for %s", addr);
           return;
  
  
  
  1.4       +1 -1      apache-2.0/src/main/rfc1413.c
  
  Index: rfc1413.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/rfc1413.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- rfc1413.c	1999/09/08 14:15:43	1.3
  +++ rfc1413.c	1999/10/04 16:37:54	1.4
  @@ -222,7 +222,7 @@
   
       result = FROM_UNKNOWN;
   
  -    if (ap_create_tcp_socket(conn->pool, &sock) != APR_SUCCESS) {
  +    if (ap_create_tcp_socket(&sock, conn->pool) != APR_SUCCESS) {
   	ap_log_error(APLOG_MARK, APLOG_CRIT, srv,
   		    "socket: rfc1413: error creating socket");
   	conn->remote_logname = result;
  
  
  
  1.10      +1 -1      apache-2.0/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- util.c	1999/09/24 21:21:20	1.9
  +++ util.c	1999/10/04 16:37:55	1.10
  @@ -885,7 +885,7 @@
           return NULL;
       }
    
  -    stat = ap_open(p, name, APR_READ | APR_BUFFERED, APR_OS_DEFAULT, &file);
  +    stat = ap_open(&file, p, name, APR_READ | APR_BUFFERED, APR_OS_DEFAULT);
   #ifdef DEBUG
       saved_errno = errno;
       ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, NULL,
  
  
  
  1.9       +1 -1      apache-2.0/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- util_script.c	1999/09/08 14:15:44	1.8
  +++ util_script.c	1999/10/04 16:37:55	1.9
  @@ -696,7 +696,7 @@
        * since that is better than allowing errors to go unnoticed.  Don't do
        * this on Win32, though, since we haven't fork()'d.
        */
  -    ap_put_os_file(r->pool, &r->server->error_log, &errfileno);
  +    ap_put_os_file(&r->server->error_log, &errfileno, r->pool);
   #endif
   
       /* TODO: all that RLimit stuff should become part of the spawning API,
  
  
  
  1.9       +4 -4      apache-2.0/src/modules/mpm/dexter/acceptlock.c
  
  Index: acceptlock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/acceptlock.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- acceptlock.c	1999/09/13 12:37:13	1.8
  +++ acceptlock.c	1999/10/04 16:38:06	1.9
  @@ -506,8 +506,8 @@
       init_lock_fname(p);
       for (i = 0; i < lock_count; i++) {
           lock_fname = expand_lock_fname(p, i);
  -        ap_open(p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
  -                APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, &tempfile);
  +        ap_open(&tempfile, p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
  +                APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD);
           ap_get_os_file(tempfile, &lock_fd[i]);
   	if (lock_fd[i] == -1) {
   	    perror("open");
  @@ -580,7 +580,7 @@
       for (i = 0; i < lock_count; i++) {
           char *lock_fname = expand_lock_fname(p, i);
       
  -        ap_open(p, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE, &tempfile);
  +        ap_open(&tempfile, p, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE);
           ap_get_os_file(tempfile, &lock_fd[i]);
           if (lock_fd[i] == -1) {
   	  ap_log_error(APLOG_MARK, APLOG_EMERG, 
  @@ -607,7 +607,7 @@
       for (i = 0; i < lock_count; i++) {
           lock_fname = expand_lock_fname(p, i);
           unlink(lock_fname);
  -        ap_open(p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL, APR_UREAD | APR_UWRITE, &tempfile);
  +        ap_open(&tempfile, p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL, APR_UREAD | APR_UWRITE);
           ap_get_os_file(tempfile, &lock_fd[i]);
           if (lock_fd[i] == -1) {
   	    ap_log_error(APLOG_MARK, APLOG_EMERG, 
  
  
  
  1.39      +6 -6      apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- dexter.c	1999/09/17 23:32:10	1.38
  +++ dexter.c	1999/10/04 16:38:09	1.39
  @@ -858,9 +858,9 @@
       int native_socket;
   
       pthread_mutex_lock(&thread_pool_create_mutex);
  -    ap_create_context(thread_pool_parent, &tpool);
  +    ap_create_context(&tpool, thread_pool_parent);
       pthread_mutex_unlock(&thread_pool_create_mutex);
  -    ap_create_context(tpool, &ptrans);
  +    ap_create_context(&ptrans, tpool);
   
       while (!workers_may_exit) {
           workers_may_exit |= (max_requests_per_child != 0) && (requests_this_child <= 0);
  @@ -923,7 +923,7 @@
                       /* XXX: Should we check for POLLERR? */
                       if (listenfds[curr_pollfd].revents & POLLIN) {
                           last_pollfd = curr_pollfd;
  -                        ap_put_os_sock(tpool, &sd, &listenfds[curr_pollfd].fd);
  +                        ap_put_os_sock(&sd, &listenfds[curr_pollfd].fd, tpool);
                           goto got_fd;
                       }
                   } while (curr_pollfd != last_pollfd);
  @@ -931,7 +931,7 @@
           }
       got_fd:
           if (!workers_may_exit) {
  -            ap_accept(sd, &csd);
  +            ap_accept(&csd, sd);
               SAFE_ACCEPT(accept_mutex_off(0));
               SAFE_ACCEPT(intra_mutex_off(0));
   	    pthread_mutex_lock(&idle_thread_count_mutex);
  @@ -981,7 +981,7 @@
   
       my_pid = getpid();
       child_num = child_num_arg;
  -    ap_create_context(pconf, &pchild);
  +    ap_create_context(&pchild, pconf);
   
       /*stuff to do before we switch id's, so we have permissions.*/
   
  @@ -1026,7 +1026,7 @@
       for (i = 0; i < max_threads; i++) {
           worker_thread_free_ids[i] = i;
       }
  -    ap_create_context(pchild, &thread_pool_parent);
  +    ap_create_context(&thread_pool_parent, pchild);
       pthread_mutex_init(&thread_pool_create_mutex, NULL);
       pthread_mutex_init(&idle_thread_count_mutex, NULL);
       pthread_mutex_init(&worker_thread_count_mutex, NULL);
  
  
  
  1.10      +3 -3      apache-2.0/src/modules/mpm/mpmt_pthread/acceptlock.c
  
  Index: acceptlock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/acceptlock.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- acceptlock.c	1999/09/11 15:58:36	1.9
  +++ acceptlock.c	1999/10/04 16:38:11	1.10
  @@ -504,8 +504,8 @@
       init_lock_fname(p);
       for (i = 0; i < lock_count; i++) {
           lock_fname = expand_lock_fname(p, i);
  -        ap_open(p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL, 
  -                APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, &tempfile);
  +        ap_open(&tempfile, p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL, 
  +                APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD);
   	ap_get_os_file(tempfile, &lock_fd[i]);
   	if (lock_fd[i] == -1) {
   	    perror("open");
  @@ -578,7 +578,7 @@
       for (i = 0; i < lock_count; i++) {
           char *lock_fname = expand_lock_fname(p, i);
       
  -        ap_open(p, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE, &tempfile);
  +        ap_open(&tempfile, p, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE);
           ap_get_os_file(tempfile, &lock_fd[i]);
           if (lock_fd[i] == -1) {
   	  ap_log_error(APLOG_MARK, APLOG_EMERG, 
  
  
  
  1.34      +5 -5      apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- mpmt_pthread.c	1999/09/17 23:32:11	1.33
  +++ mpmt_pthread.c	1999/10/04 16:38:12	1.34
  @@ -809,7 +809,7 @@
   
       free(ti);
   
  -    ap_create_context(tpool, &ptrans);
  +    ap_create_context(&ptrans, tpool);
   
       pthread_mutex_lock(&worker_thread_count_mutex);
       worker_thread_count++;
  @@ -867,7 +867,7 @@
                       /* XXX: Should we check for POLLERR? */
                       if (listenfds[curr_pollfd].revents & POLLIN) {
                           last_pollfd = curr_pollfd;
  -                        ap_put_os_sock(tpool, &sd, &listenfds[curr_pollfd].fd); 
  +                        ap_put_os_sock(&sd, &listenfds[curr_pollfd].fd, tpool); 
                           goto got_fd;
                       }
                   } while (curr_pollfd != last_pollfd);
  @@ -875,7 +875,7 @@
           }
       got_fd:
           if (!workers_may_exit) {
  -            ap_accept(sd, &csd);
  +            ap_accept(&csd, sd);
               SAFE_ACCEPT(accept_mutex_off(0));
               SAFE_ACCEPT(intra_mutex_off(0));
           }
  @@ -918,7 +918,7 @@
       ap_listen_rec *lr;
   
       my_pid = getpid();
  -    ap_create_context(pconf, &pchild);
  +    ap_create_context(&pchild, pconf);
   
       /*stuff to do before we switch id's, so we have permissions.*/
       reopen_scoreboard(pchild);
  @@ -972,7 +972,7 @@
   	my_info->pid = my_child_num;
           my_info->tid = i;
   	my_info->sd = 0;
  -	ap_create_context(pchild, &my_info->tpool);
  +	ap_create_context(&my_info->tpool, pchild);
   	
   	/* We are creating threads right now */
   	(void) ap_update_child_status(my_child_num, i, SERVER_STARTING, 
  
  
  
  1.36      +6 -6      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- prefork.c	1999/09/14 13:37:43	1.35
  +++ prefork.c	1999/10/04 16:38:14	1.36
  @@ -542,8 +542,8 @@
       unlock_it.l_pid = 0;		/* pid not actually interesting */
   
       expand_lock_fname(p);
  -    ap_open(p, ap_lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
  -            APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, &tempfile);
  +    ap_open(&tempfile, p, ap_lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
  +            APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD);
       ap_get_os_file(tempfile, &lock_fd);
       if (lock_fd == -1) {
   	perror("open");
  @@ -605,7 +605,7 @@
   {
       ap_file_t *tempfile;
   
  -    ap_open(p, ap_lock_fname, APR_WRITE, APR_UREAD|APR_UWRITE, &tempfile);
  +    ap_open(&tempfile, p, ap_lock_fname, APR_WRITE, APR_UREAD|APR_UWRITE);
       if (!tempfile) {
   	ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
   		    "Child cannot open lock file: %s", ap_lock_fname);
  @@ -1957,9 +1957,9 @@
       /* Get a sub ap_context_t for global allocations in this child, so that
        * we can have cleanups occur when the child exits.
        */
  -    ap_create_context(pconf, &pchild);
  +    ap_create_context(&pchild, pconf);
   
  -    ap_create_context(pchild, &ptrans);
  +    ap_create_context(&ptrans, pchild);
   
       /* needs to be done before we switch UIDs so we have permissions */
       reopen_scoreboard(pchild);
  @@ -2078,7 +2078,7 @@
   		    clean_child_exit(0);
   		}
   		clen = sizeof(sa_client);
  -		stat = ap_accept(sd, &csd);
  +		stat = ap_accept(&csd, sd);
   		if (stat == APR_SUCCESS || stat != APR_EINTR)
   		    break;
   	    }
  
  
  
  1.5       +2 -2      apache-2.0/src/modules/standard/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_asis.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_asis.c	1999/09/08 14:15:54	1.4
  +++ mod_asis.c	1999/10/04 16:38:15	1.5
  @@ -79,8 +79,8 @@
   	return NOT_FOUND;
       }
   
  -    if (ap_open(r->pool, r->filename, APR_READ | APR_BUFFERED, 
  -                APR_OS_DEFAULT, &f) != APR_SUCCESS) {
  +    if (ap_open(&f, r->pool, r->filename, APR_READ | APR_BUFFERED, 
  +                APR_OS_DEFAULT) != APR_SUCCESS) {
   	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "file permissions deny server access: %s", r->filename);
   	return FORBIDDEN;
  
  
  
  1.7       +1 -1      apache-2.0/src/modules/standard/mod_auth.c
  
  Index: mod_auth.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_auth.c	1999/09/14 13:37:45	1.6
  +++ mod_auth.c	1999/10/04 16:38:15	1.7
  @@ -157,7 +157,7 @@
   	return NULL;
       }
   
  -    ap_create_context(p, &sp);
  +    ap_create_context(&sp, p);
   
       while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
   	if ((l[0] == '#') || (!l[0]))
  
  
  
  1.7       +9 -9      apache-2.0/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_autoindex.c	1999/09/14 13:37:45	1.6
  +++ mod_autoindex.c	1999/10/04 16:38:16	1.7
  @@ -986,8 +986,8 @@
   		 * the file's contents, any HTML header it had won't end up
   		 * where it belongs.
   		 */
  -		if (ap_open(r->pool, rr->filename, APR_READ | APR_BUFFERED,
  -                            APR_OS_DEFAULT, &f) == APR_SUCCESS) {
  +		if (ap_open(&f, r->pool, rr->filename, APR_READ | APR_BUFFERED,
  +                            APR_OS_DEFAULT) == APR_SUCCESS) {
   		    emit_preamble(r, title);
   		    emit_amble = 0;
   		    do_emit_plain(r, f);
  @@ -1054,8 +1054,8 @@
   		/*
   		 * If we can open the file, suppress the signature.
   		 */
  -		if (ap_open(r->pool, rr->filename, APR_READ | APR_BUFFERED,
  -                            APR_OS_DEFAULT, &f) == APR_SUCCESS) {
  +		if (ap_open(&f, r->pool, rr->filename, APR_READ | APR_BUFFERED,
  +                            APR_OS_DEFAULT) == APR_SUCCESS) {
   		    do_emit_plain(r, f);
   		    ap_close(f);
   		    suppress_sig = 1;
  @@ -1090,8 +1090,8 @@
   			"text/html")
   	    || !strcmp(r->content_type, INCLUDES_MAGIC_TYPE))
   	&& !r->content_encoding) {
  -        if (ap_open(r->pool, r->filename, APR_READ | APR_BUFFERED,
  -                    APR_OS_DEFAULT, &thefile) != APR_SUCCESS) {
  +        if (ap_open(&thefile, r->pool, r->filename, APR_READ | APR_BUFFERED,
  +                    APR_OS_DEFAULT) != APR_SUCCESS) {
   	    return NULL;
   	}
           n = sizeof(char) * (MAX_STRING_LEN - 1);
  @@ -1280,7 +1280,7 @@
       char *name_scratch;
       char *pad_scratch;
   
  -    ap_create_context(r->pool, &scratch);
  +    ap_create_context(&scratch, r->pool);
       if (name[0] == '\0') {
   	name = "/";
       }
  @@ -1513,7 +1513,7 @@
       char keyid;
       char direction;
   
  -    if (ap_opendir(r->pool, name, &d) != APR_SUCCESS) {
  +    if (ap_opendir(&d, r->pool, name) != APR_SUCCESS) {
   	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "Can't open directory for index: %s", r->filename);
   	return HTTP_FORBIDDEN;
  @@ -1578,7 +1578,7 @@
       head = NULL;
       while (ap_readdir(d)) {
           char *d_name;
  -        ap_get_dir_filename(d, &d_name);
  +        ap_get_dir_filename(&d_name, d);
   	p = make_autoindex_entry(d_name, autoindex_opts,
   				 autoindex_conf, r, keyid, direction);
   	if (p != NULL) {
  
  
  
  1.6       +1 -1      apache-2.0/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_log_config.c	1999/09/08 14:15:55	1.5
  +++ mod_log_config.c	1999/10/04 16:38:16	1.6
  @@ -1001,7 +1001,7 @@
       }
       else {
           const char *fname = ap_server_root_relative(p, cls->fname);
  -        if (ap_open(p, fname, xfer_flags, xfer_mode, &cls->log_fd) != APR_SUCCESS) {
  +        if (ap_open(&cls->log_fd, p, fname, xfer_flags, xfer_mode) != APR_SUCCESS) {
               ap_log_error(APLOG_MARK, APLOG_ERR, s,
                            "could not open transfer log file %s.", fname);
               exit(1);
  
  
  
  1.6       +4 -4      apache-2.0/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_negotiation.c	1999/09/11 22:14:11	1.5
  +++ mod_negotiation.c	1999/10/04 16:38:16	1.6
  @@ -782,8 +782,8 @@
       /* We are not using multiviews */
       neg->count_multiviews_variants = 0;
   
  -    if (ap_open(neg->pool, rr->filename, APR_READ | APR_BUFFERED,
  -                APR_OS_DEFAULT, &map) != APR_SUCCESS) {
  +    if (ap_open(&map, neg->pool, rr->filename, APR_READ | APR_BUFFERED,
  +                APR_OS_DEFAULT) != APR_SUCCESS) {
           ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                         "cannot access type map file: %s", rr->filename);
           return HTTP_FORBIDDEN;
  @@ -908,7 +908,7 @@
       ++filp;
       prefix_len = strlen(filp);
   
  -    if (ap_opendir(neg->pool, neg->dir_name, &dirp) != APR_SUCCESS) {
  +    if (ap_opendir(&dirp, neg->pool, neg->dir_name) != APR_SUCCESS) {
           ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                       "cannot read directory for multi: %s", neg->dir_name);
           return HTTP_FORBIDDEN;
  @@ -918,7 +918,7 @@
           request_rec *sub_req;
           char *d_name;
   
  -        ap_get_dir_filename(dirp, &d_name);
  +        ap_get_dir_filename(&d_name, dirp);
           /* Do we have a match? */
   
           if (strncmp(d_name, filp, prefix_len)) {
  
  
  

Mime
View raw message