httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-apr/include apr_file_io.h apr_lock.h apr_network_io.h apr_thread_proc.h apr_time.h
Date Mon, 24 May 1999 02:04:26 GMT
rbb         99/05/23 19:04:25

  Modified:    apr/file_io/beos dir.c fileacc.c filedup.c filestat.c open.c
                        pipe.c readwrite.c seek.c
               apr/file_io/unix dir.c fileacc.c filedup.c filestat.c open.c
                        readwrite.c seek.c
               apr/locks/unix crossproc.c intraproc.c locks.c
               apr/network_io/beos poll.c sockets.c sockopt.c
               apr/network_io/unix poll.c sendrecv.c sockets.c sockopt.c
               apr/test ab_apr.c client.c server.c testfile.c testproc.c
                        testsock.c testthread.c testtime.c
               apr/threadproc/beos proc.c thread.c threadcancel.c
                        threadpriv.c
               apr/threadproc/unix proc.c signals.c thread.c threadcancel.c
                        threadpriv.c
               apr/time/unix access.c time.c
               include  apr_file_io.h apr_lock.h apr_network_io.h
                        apr_thread_proc.h apr_time.h
  Log:
  All functions now have access to context types either directly, or indirectly,
  but not both.  I removed the context parameter for functions that are taking
  an apr type.  Threads don't work, but everything else does.  I'm still
  debugging the thread logic.  I changed all the current platforms, but
  everything except unix needs to be tried and fixed.
  
  Revision  Changes    Path
  1.4       +3 -3      apache-apr/apr/file_io/beos/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/beos/dir.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dir.c	1999/05/17 18:31:27	1.3
  +++ dir.c	1999/05/24 02:03:56	1.4
  @@ -90,7 +90,7 @@
       }
   }
   
  -ap_status_t ap_closedir(ap_context_t *cont, struct dir_t *thedir)
  +ap_status_t ap_closedir(struct dir_t *thedir)
   {
       if (dir_cleanup(thedir) == APR_SUCCESS) {
           ap_kill_cleanup(cont->pool, thedir, dir_cleanup);
  @@ -101,7 +101,7 @@
       }
   } 
   
  -ap_status_t ap_readdir(ap_context_t *cont, struct dir_t *thedir)
  +ap_status_t ap_readdir(struct dir_t *thedir)
   {
       thedir->entry = readdir(thedir->dirstruct);
    	if (thedir->entry == NULL){
  @@ -110,7 +110,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_rewinddir(ap_context_t *cont, struct dir_t *thedir)
  +ap_status_t ap_rewinddir(struct dir_t *thedir)
   {
       rewinddir(thedir->dirstruct);
       return APR_SUCCESS;
  
  
  
  1.4       +1 -1      apache-apr/apr/file_io/beos/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/beos/fileacc.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- fileacc.c	1999/05/17 18:31:29	1.3
  +++ fileacc.c	1999/05/24 02:03:56	1.4
  @@ -61,7 +61,7 @@
   
   /* A file to put ALL of the accessor functions for struct file_t types. */
   
  -char * ap_get_filename(ap_context_t *cont, struct file_t *thefile)
  +char * ap_get_filename(struct file_t *thefile)
   {
       if (thefile != NULL) {
           return thefile->fname;
  
  
  
  1.4       +1 -1      apache-apr/apr/file_io/beos/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/beos/filedup.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- filedup.c	1999/05/17 18:31:30	1.3
  +++ filedup.c	1999/05/24 02:03:56	1.4
  @@ -58,7 +58,7 @@
   #include "apr_file_io.h"
   #include "apr_general.h"
   
  -struct file_t *ap_dupfile(ap_context_t *cont, struct file_t *old_file)
  +struct file_t *ap_dupfile(struct file_t *old_file)
   {
       struct file_t * new_file = (struct file_t *)ap_palloc(cont->pool,sizeof(struct file_t));
       
  
  
  
  1.4       +2 -2      apache-apr/apr/file_io/beos/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/beos/filestat.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- filestat.c	1999/05/17 18:31:31	1.3
  +++ filestat.c	1999/05/24 02:03:56	1.4
  @@ -58,7 +58,7 @@
   #include "apr_file_io.h"
   #include "apr_errno.h"
   
  -ap_status_t ap_getfileinfo(ap_context_t *cont, char * fname, struct file_t *thefile)
  +ap_status_t ap_getfileinfo(struct file_t *thefile)
   {
       struct stat info;
       int rv = stat(fname, &info);
  @@ -79,7 +79,7 @@
       }
   }
   
  -ap_status_t ap_updatefileinfo(ap_context_t *cont, struct file_t *thefile)
  +ap_status_t ap_updatefileinfo(struct file_t *thefile)
   {
       struct stat info;
       int rv = fstat(thefile->filedes, &info);
  
  
  
  1.5       +1 -1      apache-apr/apr/file_io/beos/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/beos/open.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- open.c	1999/05/17 18:31:32	1.4
  +++ open.c	1999/05/24 02:03:57	1.5
  @@ -139,7 +139,7 @@
       }
   }
   
  -ap_status_t ap_close(ap_context_t *cont, struct file_t * file)
  +ap_status_t ap_close(struct file_t * file)
   {
       if (file_cleanup(file) == APR_SUCCESS) {
           ap_kill_cleanup(cont->pool, file, file_cleanup);
  
  
  
  1.2       +1 -1      apache-apr/apr/file_io/beos/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/beos/pipe.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pipe.c	1999/05/17 18:31:32	1.1
  +++ pipe.c	1999/05/24 02:03:57	1.2
  @@ -62,7 +62,7 @@
   #include "apr_file_io.h"
   #include "apr_general.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 *out)
   {
       int filedes[2];
       if (pipe(filedes) == -1) {
  
  
  
  1.5       +3 -3      apache-apr/apr/file_io/beos/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/beos/readwrite.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- readwrite.c	1999/05/17 18:31:32	1.4
  +++ readwrite.c	1999/05/24 02:03:57	1.5
  @@ -60,7 +60,7 @@
   #include "apr_general.h"
   #include "apr_errno.h"
   
  -ap_ssize_t ap_read(ap_context_t *cont, struct file_t *thefile, void *buf, ap_ssize_t nbytes)
  +ap_ssize_t ap_read(struct file_t *thefile, void *buf, ap_ssize_t nbytes)
   {
       ap_size_t rv;
   
  @@ -74,7 +74,7 @@
       return rv;
   }
   
  -ap_ssize_t ap_write(ap_context_t *cont, struct file_t *thefile, void * buf, ap_ssize_t nbytes)
  +ap_ssize_t ap_write(struct file_t *thefile, void * buf, ap_ssize_t nbytes)
   {
       ap_size_t rv;
       struct stat info;
  @@ -95,7 +95,7 @@
       return rv;
   }	
   
  -ap_ssize_t ap_writev(ap_context_t *cont, struct file_t *thefile, const struct iovec_t *vec, ap_ssize_t iocnt)
  +ap_ssize_t ap_writev(struct iovec_t *vec, ap_ssize_t iocnt)
   {
   	ap_ssize_t bytes;
   	if ((bytes = writev(thefile->filedes, vec->iovec, iocnt)) < 0){
  
  
  
  1.4       +1 -1      apache-apr/apr/file_io/beos/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/beos/seek.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- seek.c	1999/05/17 18:31:33	1.3
  +++ seek.c	1999/05/24 02:03:57	1.4
  @@ -58,7 +58,7 @@
   #include "fileio.h"
   #include "apr_file_io.h"
   
  -ap_off_t ap_seek(ap_context_t *cont, struct file_t *thefile, ap_off_t offset, ap_seek_where_t where)
  +ap_off_t ap_seek(struct file_t *thefile, ap_off_t offset, ap_seek_where_t where)
   {
       return lseek(thefile->filedes, offset, where);
   }
  
  
  
  1.9       +7 -7      apache-apr/apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/dir.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- dir.c	1999/05/21 19:53:11	1.8
  +++ dir.c	1999/05/24 02:03:59	1.9
  @@ -91,7 +91,7 @@
       }
   }
   
  -ap_status_t ap_closedir(ap_context_t *cont, struct dir_t *thedir)
  +ap_status_t ap_closedir(struct dir_t *thedir)
   {
       if (dir_cleanup(thedir) == APR_SUCCESS) {
           ap_kill_cleanup(thedir->cntxt->pool, thedir, dir_cleanup);
  @@ -100,7 +100,7 @@
       return APR_FAILURE;
   }
   
  -ap_status_t ap_readdir(ap_context_t *cont, struct dir_t *thedir)
  +ap_status_t ap_readdir(struct dir_t *thedir)
   {
       thedir->entry = readdir(thedir->dirstruct);
       if (thedir->entry == NULL) {
  @@ -109,7 +109,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_rewinddir(ap_context_t *cont, struct dir_t *thedir)
  +ap_status_t ap_rewinddir(struct dir_t *thedir)
   {
       rewinddir(thedir->dirstruct);
       return APR_SUCCESS;
  @@ -136,7 +136,7 @@
       }
   }
   
  -ap_ssize_t ap_dir_entry_size(ap_context_t *cont, ap_dir_t *thedir)
  +ap_ssize_t ap_dir_entry_size(struct dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;    
  @@ -155,7 +155,7 @@
       return filestat.st_size;
   }
   
  -time_t ap_dir_entry_mtime(ap_context_t *cont, ap_dir_t *thedir)
  +time_t ap_dir_entry_mtime(struct dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;
  @@ -175,7 +175,7 @@
       return filestat.st_mtime;
   }
    
  -ap_filetype_e ap_dir_entry_ftype(ap_context_t *cont, ap_dir_t *thedir)
  +ap_filetype_e ap_dir_entry_ftype(struct dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;
  @@ -208,7 +208,7 @@
           return APR_SOCK;    
   }
   
  -char * ap_get_dir_filename(ap_context_t * cont, ap_dir_t *thedir)
  +char * ap_get_dir_filename(struct dir_t *thedir)
   {
       char *name = (char *)ap_palloc(thedir->cntxt->pool, strlen(thedir->entry->d_name));
       name = ap_pstrdup(thedir->cntxt->pool, thedir->entry->d_name);
  
  
  
  1.8       +6 -6      apache-apr/apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- fileacc.c	1999/05/19 17:34:21	1.7
  +++ fileacc.c	1999/05/24 02:03:59	1.8
  @@ -62,7 +62,7 @@
   
   /* A file to put ALL of the accessor functions for struct file_t types. */
   
  -char * ap_get_filename(ap_context_t *cont, struct file_t *thefile)
  +char * ap_get_filename(struct file_t *thefile)
   {
       if (thefile != NULL) {
           return thefile->fname;
  @@ -100,27 +100,27 @@
       return rv;
   }
   
  -ap_ssize_t ap_get_filesize(ap_context_t *cont, struct file_t *file)
  +ap_ssize_t ap_get_filesize(struct file_t *file)
   {
       return file->size;
   }
   
  -ap_fileperms_t ap_get_fileperms(ap_context_t *cont, struct file_t *file)
  +ap_fileperms_t ap_get_fileperms(struct file_t *file)
   {
       return file->protection;
   }
   
  -time_t ap_get_fileatime(ap_context_t *cont, struct file_t *file)
  +time_t ap_get_fileatime(struct file_t *file)
   {    
       return file->atime;
   }
   
  -time_t ap_get_filectime(ap_context_t *cont, struct file_t *file)
  +time_t ap_get_filectime(struct file_t *file)
   {    
       return file->ctime;
   }
   
  -time_t ap_get_filemtime(ap_context_t *cont, struct file_t *file)
  +time_t ap_get_filemtime(struct file_t *file)
   {    
       return file->mtime;
   }
  
  
  
  1.11      +1 -1      apache-apr/apr/file_io/unix/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/filedup.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- filedup.c	1999/05/21 19:53:12	1.10
  +++ filedup.c	1999/05/24 02:03:59	1.11
  @@ -58,7 +58,7 @@
   #include "apr_general.h"
   #include <string.h>
   
  -struct file_t *ap_dupfile(ap_context_t *cont, struct file_t *old_file)
  +struct file_t *ap_dupfile(struct file_t *old_file)
   {
       struct file_t *new_file = (struct file_t *)ap_palloc(old_file->cntxt->pool,
                                  sizeof(struct file_t));
  
  
  
  1.5       +3 -3      apache-apr/apr/file_io/unix/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/filestat.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- filestat.c	1999/05/12 18:03:17	1.4
  +++ filestat.c	1999/05/24 02:04:00	1.5
  @@ -58,10 +58,10 @@
   #include "apr_general.h"
   #include "apr_errno.h"
   
  -ap_status_t ap_getfileinfo(ap_context_t *cont, char * fname, struct file_t *thefile)
  +ap_status_t ap_getfileinfo(struct file_t *thefile)
   {
       struct stat info;
  -    int rv = stat(fname, &info);
  +    int rv = stat(thefile->fname, &info);
   
       if (rv == 0) {
           thefile->protection = info.st_mode;
  @@ -79,7 +79,7 @@
       }
   }
   
  -ap_status_t ap_updatefileinfo(ap_context_t *cont, struct file_t *thefile)
  +ap_status_t ap_updatefileinfo(struct file_t *thefile)
   {
       struct stat info;
       int rv = fstat(thefile->filedes, &info);
  
  
  
  1.22      +2 -2      apache-apr/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/open.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- open.c	1999/05/21 19:53:13	1.21
  +++ open.c	1999/05/24 02:04:00	1.22
  @@ -130,7 +130,7 @@
           return NULL;
       }
   
  -    if (ap_updatefileinfo(dafile->cntxt, dafile) == APR_SUCCESS) {
  +    if (ap_updatefileinfo(dafile) == APR_SUCCESS) {
   	ap_register_cleanup(dafile->cntxt->pool, (void *)dafile, file_cleanup, NULL);
           return dafile;
       }
  @@ -141,7 +141,7 @@
       }
   }
   
  -ap_status_t ap_close(ap_context_t *cont, struct file_t *file)
  +ap_status_t ap_close(struct file_t *file)
   {
       if (file_cleanup(file) == APR_SUCCESS) {
           ap_kill_cleanup(file->cntxt->pool, file, file_cleanup);
  
  
  
  1.9       +3 -3      apache-apr/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- readwrite.c	1999/05/12 19:15:30	1.8
  +++ readwrite.c	1999/05/24 02:04:00	1.9
  @@ -61,7 +61,7 @@
   #include <unistd.h>
   #include <sys/uio.h>
   
  -ap_ssize_t ap_read(ap_context_t *cont, struct file_t *thefile, void *buf, ap_ssize_t nbytes)
  +ap_ssize_t ap_read(struct file_t *thefile, void *buf, ap_ssize_t nbytes)
   {
       ap_size_t rv;
   
  @@ -75,7 +75,7 @@
       return rv;
   }
   
  -ap_ssize_t ap_write(ap_context_t *cont, struct file_t *thefile, void *buf, ap_ssize_t nbytes)
  +ap_ssize_t ap_write(struct file_t *thefile, void *buf, ap_ssize_t nbytes)
   {
       ap_size_t rv;
       struct stat info;
  @@ -96,7 +96,7 @@
       return rv;
   }
   
  -ap_ssize_t ap_writev(ap_context_t *cont, struct file_t *thefile, const struct iovec_t *vec, ap_ssize_t iocnt)
  +ap_ssize_t ap_writev(struct file_t *thefile, const struct iovec_t *vec, ap_ssize_t iocnt)
   {
       int bytes;
       if ((bytes = writev(thefile->filedes, vec->iovec, iocnt)) < 0) {
  
  
  
  1.5       +1 -1      apache-apr/apr/file_io/unix/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/seek.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- seek.c	1999/05/12 18:03:27	1.4
  +++ seek.c	1999/05/24 02:04:00	1.5
  @@ -58,7 +58,7 @@
   #include <errno.h>
   #include <string.h>
   
  -ap_off_t ap_seek(ap_context_t *cont, struct file_t *thefile, ap_off_t offset, ap_seek_where_t where)
  +ap_off_t ap_seek(struct file_t *thefile, ap_off_t offset, ap_seek_where_t where)
   {
       return lseek(thefile->filedes, offset, where);
   }
  
  
  
  1.5       +16 -16    apache-apr/apr/locks/unix/crossproc.c
  
  Index: crossproc.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/locks/unix/crossproc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- crossproc.c	1999/05/21 19:53:23	1.4
  +++ crossproc.c	1999/05/24 02:04:03	1.5
  @@ -70,7 +70,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_inter_lock(ap_context_t *cont, struct lock_t *new)
  +ap_status_t create_inter_lock(struct lock_t *new)
   {
       union semun ick;
       struct semid_ds buf;
  @@ -99,7 +99,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t lock_inter(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t lock_inter(struct lock_t *lock)
   {
       new->curr_locked == 1;
       if (semop(lock->interproc, &lock->op_on, 1) < 0) {
  @@ -108,7 +108,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t unlock_inter(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t unlock_inter(struct lock_t *lock)
   {
       if (semop(lock->interproc, &lock->op_off, 1) < 0) {
           return(APR_FAILURE);
  @@ -117,7 +117,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t destroy_inter_lock(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t destroy_inter_lock(struct lock_t *lock)
   {
       if (lock_cleanup(lock) == APR_SUCCESS) {
           ap_kill_cleanup(lock->cntxt->pool, lock, lock_cleanup);
  @@ -140,7 +140,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_inter_lock(ap_context_t *cont, struct lock_t *new)
  +ap_status_t create_inter_lock(struct lock_t *new)
   {
       int fd;
       pthread_mutexattr_t mattr;
  @@ -182,7 +182,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t lock_inter(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t lock_inter(struct lock_t *lock)
   {
       new->curr_locked == 1;
       if (errno = pthread_mutex_lock(lock->interproc)) {
  @@ -191,7 +191,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t unlock_inter(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t unlock_inter(struct lock_t *lock)
   {
       if (errno = pthread_mutex_unlock(lock->interproc)) {
           return(APR_FAILURE);
  @@ -200,7 +200,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t destroy_inter_lock(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t destroy_inter_lock(struct lock_t *lock)
   {
       if (lock_cleanup(lock) == APR_SUCCESS) {
           ap_kill_cleanup(lock->cntxt->pool, lock, lock_cleanup);
  @@ -222,7 +222,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_inter_lock(ap_context_t *cont, struct lock_t *new)
  +ap_status_t create_inter_lock(struct lock_t *new)
   {
       new->interproc = open(new->fname, O_CREAT | O_WRONLY | O_EXCL, 0644);
   
  @@ -248,7 +248,7 @@
       return APR_SUCCESS; 
   }
   
  -ap_status_t lock_inter(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t lock_inter(struct lock_t *lock)
   {
       lock->curr_locked == 1;
       if (fcntl(lock->interproc, F_SETLKW, &lock->lock_it) < 0) {
  @@ -257,7 +257,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t unlock_inter(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t unlock_inter(struct lock_t *lock)
   {
       if (fcntl(lock->interproc, F_SETLKW, &lock->unlock_it) < 0) {
           return(APR_FAILURE);
  @@ -266,7 +266,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t destroy_inter_lock(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t destroy_inter_lock(struct lock_t *lock)
   {
       if (lock_cleanup(lock) == APR_SUCCESS) {
           ap_kill_cleanup(lock->cntxt->pool, lock, lock_cleanup);
  @@ -287,7 +287,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_inter_lock(ap_context_t *cont, struct lock_t *new)
  +ap_status_t create_inter_lock(struct lock_t *new)
   {
       new->interproc = open(new->fname, O_CREAT | O_WRONLY | O_EXCL, 0600);
   
  @@ -300,7 +300,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t lock_inter(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t lock_inter(struct lock_t *lock)
   {
       new->curr_locked == 1;
       if (flock(lock->interproc, LOCK_EX) < 0) {
  @@ -309,7 +309,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t unlock_inter(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t unlock_inter(struct lock_t *lock)
   {
       if (flock(lock->interproc, LOCK_UN) < 0) {
           return(APR_FAILURE);
  @@ -318,7 +318,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t destroy_inter_lock(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t destroy_inter_lock(struct lock_t *lock)
   {
       if (lock_cleanup(lock) == APR_SUCCESS) {
           ap_kill_cleanup(lock->cntxt->pool, lock, lock_cleanup);
  
  
  
  1.5       +4 -4      apache-apr/apr/locks/unix/intraproc.c
  
  Index: intraproc.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/locks/unix/intraproc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- intraproc.c	1999/05/21 19:53:25	1.4
  +++ intraproc.c	1999/05/24 02:04:03	1.5
  @@ -69,7 +69,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_intra_lock(ap_context_t *cont, struct lock_t *new)
  +ap_status_t create_intra_lock(struct lock_t *new)
   {
       pthread_mutexattr_t mattr;
   
  @@ -98,7 +98,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t lock_intra(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t lock_intra(struct lock_t *lock)
   {
       lock->curr_locked == 1;
       if (errno = pthread_mutex_lock(lock->intraproc)) {
  @@ -107,7 +107,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t unlock_intra(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t unlock_intra(struct lock_t *lock)
   {
       if (errno = pthread_mutex_unlock(lock->intraproc)) {
           return(APR_FAILURE);
  @@ -116,7 +116,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t destroy_intra_lock(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t destroy_intra_lock(struct lock_t *lock)
   {
       if (lock_intra_cleanup(lock) == APR_SUCCESS) {
           ap_kill_cleanup(lock->cntxt->pool, lock, lock_intra_cleanup);
  
  
  
  1.5       +5 -5      apache-apr/apr/locks/unix/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/locks/unix/locks.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- locks.c	1999/05/21 19:53:26	1.4
  +++ locks.c	1999/05/24 02:04:04	1.5
  @@ -68,19 +68,19 @@
       new->fname = strdup(fname);
   
       if (type != APR_CROSS_PROCESS) {
  -        if (create_intra_lock(new->cntxt, new) == APR_FAILURE) {
  +        if (create_intra_lock(new) == APR_FAILURE) {
               return NULL;
           }
       }
       if (type != APR_INTRAPROCESS) {
  -        if (create_inter_lock(new->cntxt, new) == APR_FAILURE) {
  +        if (create_inter_lock(new) == APR_FAILURE) {
               return NULL;
           }
       }
       return new;
   }
   
  -ap_status_t ap_lock(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t ap_lock(struct lock_t *lock)
   {
       if (lock->type != APR_CROSS_PROCESS) {
           if (lock_intra(lock->cntxt, lock) == APR_FAILURE) {
  @@ -95,7 +95,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unlock(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t ap_unlock(struct lock_t *lock)
   {
       if (lock->type != APR_CROSS_PROCESS) {
           if (unlock_intra(lock->cntxt, lock) == APR_FAILURE) {
  @@ -110,7 +110,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_destroy_lock(ap_context_t *cont, struct lock_t *lock)
  +ap_status_t ap_destroy_lock(struct lock_t *lock)
   {
       if (lock->type != APR_CROSS_PROCESS) {
           if (destroy_intra_lock(lock->cntxt, lock) == APR_FAILURE) {
  
  
  
  1.2       +2 -2      apache-apr/apr/network_io/beos/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/network_io/beos/poll.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- poll.c	1999/05/17 18:37:44	1.1
  +++ poll.c	1999/05/24 02:04:05	1.2
  @@ -93,7 +93,7 @@
       return rv; 
   } 
    
  -void ap_add_poll_socket(ap_context_t *cont, struct pollfd_t *aprset, 
  +void ap_add_poll_socket(struct pollfd_t *aprset, 
                                 struct socket_t *sock, ap_int16_t event, 
                                  ap_int32_t pos) 
   { 
  @@ -101,7 +101,7 @@
       aprset[pos].events = get_event(event); 
   } 
   
  -ap_int32_t ap_poll(ap_context_t *cont, struct pollfd_t *aprset, ap_int32_t nsds, ap_int32_t timeout)
  +ap_int32_t ap_poll(struct pollfd_t *aprset, ap_int32_t nsds, ap_int32_t timeout)
   {
       int i;
       int rv,maxfd;
  
  
  
  1.4       +7 -7      apache-apr/apr/network_io/beos/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/network_io/beos/sockets.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sockets.c	1999/05/17 18:37:44	1.3
  +++ sockets.c	1999/05/24 02:04:06	1.4
  @@ -93,7 +93,7 @@
       }
   } 
   
  -ap_status_t ap_shutdown(ap_context_t *cont, struct socket_t *thesocket, ap_shutdown_how_e how)
  +ap_status_t ap_shutdown(struct socket_t *thesocket, ap_shutdown_how_e how)
   {
       /*if (shutdown(thesocket->socketdes, how) == 0) {*/
           return APR_SUCCESS;
  @@ -103,19 +103,19 @@
       }*/
   }
   
  -ap_status_t ap_close_socket(ap_context_t *cont, struct socket_t *thesocket)
  +ap_status_t ap_close_socket(struct socket_t *thesocket)
   {
   	socket_cleanup(thesocket);
   	ap_kill_cleanup(cont->pool,thesocket,socket_cleanup);
   }
   
  -ap_status_t ap_setport(ap_context_t *cont, struct socket_t *sock, ap_uint32_t port) 
  +ap_status_t ap_setport(struct socket_t *sock, ap_uint32_t port) 
   { 
       sock->addr->sin_port = htons((short)port); 
       return APR_SUCCESS; 
   } 
   
  -ap_status_t ap_bind(ap_context_t *cont, struct socket_t *sock) 
  +ap_status_t ap_bind(struct socket_t *sock) 
   { 
       sock->addr->sin_addr.s_addr = INADDR_ANY;
       if (bind(sock->socketdes, (struct sockaddr *)sock->addr, sock->addr_len) == -1) 
  @@ -124,7 +124,7 @@
           return APR_SUCCESS; 
   } 
    
  -ap_status_t ap_listen(ap_context_t *cont, struct socket_t *sock, ap_int32_t backlog) 
  +ap_status_t ap_listen(struct socket_t *sock, ap_int32_t backlog) 
   { 
       if (listen(sock->socketdes, backlog) == -1) 
           return APR_FAILURE; 
  @@ -132,7 +132,7 @@
           return APR_SUCCESS; 
   } 
   
  -struct socket_t *ap_accept(ap_context_t *cont, const struct socket_t *sock) 
  +struct socket_t *ap_accept(struct socket_t *sock) 
   { 
       struct socket_t *new = (ap_socket_t *)ap_palloc(cont->pool,sizeof(ap_socket_t)); 
   	struct hostent *hptr;
  @@ -154,7 +154,7 @@
       return new;
   } 
    
  -ap_status_t ap_connect(ap_context_t *cont, struct socket_t *sock, char *hostname) 
  +ap_status_t ap_connect(struct socket_t *sock, char *hostname) 
   { 
       struct hostent *hp; 
   
  
  
  
  1.4       +2 -2      apache-apr/apr/network_io/beos/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/network_io/beos/sockopt.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sockopt.c	1999/05/17 18:37:45	1.3
  +++ sockopt.c	1999/05/24 02:04:06	1.4
  @@ -62,7 +62,7 @@
   #include "apr_network_io.h"
   #include "apr_general.h"
   
  -ap_status_t ap_setsocketopt(ap_context_t *cont, struct socket_t *sock, ap_int32_t opt, ap_int32_t on)
  +ap_status_t ap_setsocketopt(struct socket_t *sock, ap_int32_t opt, ap_int32_t on)
   {
       int one;
       if (on){
  @@ -97,7 +97,7 @@
   	}
   }
   
  -char *ap_get_remote_hostname(ap_context_t *cont, struct socket_t *sock)
  +char *ap_get_remote_hostname(struct socket_t *sock)
   {
   	return sock->remote_hostname;
   }
  
  
  
  1.7       +3 -3      apache-apr/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/network_io/unix/poll.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- poll.c	1999/05/21 19:53:37	1.6
  +++ poll.c	1999/05/24 02:04:08	1.7
  @@ -108,7 +108,7 @@
       return rv;
   }
   
  -void ap_add_poll_socket(ap_context_t *cont, struct pollfd_t *aprset, 
  +void ap_add_poll_socket(struct pollfd_t *aprset, 
   			       struct socket_t *sock, ap_int16_t event, 
                                  ap_int32_t pos)
   {
  @@ -116,7 +116,7 @@
       aprset[pos].events = get_event(event);
   }
   
  -ap_int32_t ap_poll(ap_context_t *cont, struct pollfd_t *aprset, ap_int32_t nsds, ap_int32_t timeout)
  +ap_int32_t ap_poll(struct pollfd_t *aprset, ap_int32_t nsds, ap_int32_t timeout)
   {
       int i;
       struct pollfd *pollset;
  @@ -138,7 +138,7 @@
       return rv;
   }
   
  -ap_int16_t ap_get_revents(ap_context_t *cont, struct pollfd_t *aprset, ap_int32_t pos)
  +ap_int16_t ap_get_revents(struct pollfd_t *aprset, ap_int32_t pos)
   {
       return aprset[pos].revents;
   }
  
  
  
  1.8       +2 -2      apache-apr/apr/network_io/unix/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/network_io/unix/sendrecv.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sendrecv.c	1999/05/12 19:46:17	1.7
  +++ sendrecv.c	1999/05/24 02:04:08	1.8
  @@ -61,7 +61,7 @@
   #include "apr_network_io.h"
   #include <sys/time.h>
   
  -ap_ssize_t ap_send(ap_context_t *cont, struct socket_t *sock, const char *buf, int len, time_t sec)
  +ap_ssize_t ap_send(struct socket_t *sock, const char *buf, int len, time_t sec)
   {
       ssize_t rv;
       
  @@ -95,7 +95,7 @@
       return (ap_ssize_t) rv;
   }
   
  -ap_ssize_t ap_recv(ap_context_t *cont, struct socket_t *sock, char *buf, int len, time_t sec)
  +ap_ssize_t ap_recv(struct socket_t *sock, char *buf, int len, time_t sec)
   {
       ssize_t rv;
       
  
  
  
  1.16      +7 -7      apache-apr/apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/network_io/unix/sockets.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- sockets.c	1999/05/21 19:53:39	1.15
  +++ sockets.c	1999/05/24 02:04:08	1.16
  @@ -102,7 +102,7 @@
       }
   } 
   
  -ap_status_t ap_shutdown(ap_context_t *cont, struct socket_t *thesocket, ap_shutdown_how_e how)
  +ap_status_t ap_shutdown(struct socket_t *thesocket, ap_shutdown_how_e how)
   {
       if (shutdown(thesocket->socketdes, how) == 0) {
           return APR_SUCCESS;
  @@ -112,19 +112,19 @@
       }
   }
   
  -ap_status_t ap_close_socket(ap_context_t *cont, struct socket_t *thesocket)
  +ap_status_t ap_close_socket(struct socket_t *thesocket)
   {
       socket_cleanup(thesocket);
       ap_kill_cleanup(thesocket->cntxt->pool, thesocket, socket_cleanup);
   }
   
  -ap_status_t ap_setport(ap_context_t *cont, struct socket_t *sock, ap_uint32_t port)
  +ap_status_t ap_setport(struct socket_t *sock, ap_uint32_t port)
   {
       sock->addr->sin_port = htons((short)port);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_bind(ap_context_t *cont, struct socket_t *sock)
  +ap_status_t ap_bind(struct socket_t *sock)
   {
       sock->addr->sin_addr.s_addr = INADDR_ANY;
       if (bind(sock->socketdes, (struct sockaddr *)sock->addr, sock->addr_len) == -1)
  @@ -133,7 +133,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_listen(ap_context_t *cont, struct socket_t *sock, ap_int32_t backlog)
  +ap_status_t ap_listen(struct socket_t *sock, ap_int32_t backlog)
   {
       if (listen(sock->socketdes, backlog) == -1)
           return APR_FAILURE;
  @@ -141,7 +141,7 @@
           return APR_SUCCESS;
   }
   
  -struct socket_t *ap_accept(ap_context_t *cont, const struct socket_t *sock)
  +struct socket_t *ap_accept(const struct socket_t *sock)
   {
       struct socket_t *new = (struct socket_t *)ap_palloc(sock->cntxt->pool, 
                               sizeof(struct socket_t));
  @@ -167,7 +167,7 @@
       return new;
   }
   
  -ap_status_t ap_connect(ap_context_t *cont, struct socket_t *sock, char *hostname)
  +ap_status_t ap_connect(struct socket_t *sock, char *hostname)
   {
       struct hostent *hp;
   
  
  
  
  1.6       +2 -2      apache-apr/apr/network_io/unix/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/network_io/unix/sockopt.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sockopt.c	1999/05/12 19:46:17	1.5
  +++ sockopt.c	1999/05/24 02:04:08	1.6
  @@ -101,7 +101,7 @@
   }
   
   
  -ap_status_t ap_setsocketopt(ap_context_t *cont, struct socket_t *sock, ap_int32_t opt, ap_int32_t on)
  +ap_status_t ap_setsocketopt(struct socket_t *sock, ap_int32_t opt, ap_int32_t on)
   {
       int one;
       struct linger li;
  @@ -154,7 +154,7 @@
           return APR_SUCCESS;
   }
   
  -char *ap_get_remote_hostname(ap_context_t *cont, struct socket_t *sock)
  +char *ap_get_remote_hostname(struct socket_t *sock)
   {
       return sock->remote_hostname;
   }
  
  
  
  1.10      +13 -13    apache-apr/apr/test/ab_apr.c
  
  Index: ab_apr.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/ab_apr.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ab_apr.c	1999/05/21 13:02:32	1.9
  +++ ab_apr.c	1999/05/24 02:04:10	1.10
  @@ -217,16 +217,16 @@
   static void write_request(struct connection *c)
   {
       gettimeofday(&c->connect, 0);
  -    if (ap_send(cntxt, c->aprsock, request, reqlen, 30) != reqlen) {
  +    if (ap_send(c->aprsock, request, reqlen, 30) != reqlen) {
           printf("Send request failed!\n");
       }
       if (posting) {
  -        ap_send(cntxt, c->aprsock, postdata, postlen, 30);
  +        ap_send(c->aprsock, postdata, postlen, 30);
           totalposted += (reqlen + postlen);
       }
   
       c->state = STATE_READ;
  -    ap_add_poll_socket(cntxt, readbits, c->aprsock, APR_POLLIN, c->socknum);
  +    ap_add_poll_socket(readbits, c->aprsock, APR_POLLIN, c->socknum);
   }
   
           /* --------------------------------------------------------- */
  @@ -455,14 +455,14 @@
       if ((c->aprsock = ap_create_tcp_socket(cntxt)) == NULL) {
           err("Socket:");
       }
  -    if (ap_setport(cntxt, c->aprsock, port) == APR_FAILURE) {
  +    if (ap_setport(c->aprsock, port) == APR_FAILURE) {
           err("Port:");
       }
       gettimeofday(&c->start, 0);
  -    if (ap_connect(cntxt, c->aprsock, hostname) == APR_FAILURE) {
  +    if (ap_connect(c->aprsock, hostname) == APR_FAILURE) {
           if (errno == EINPROGRESS) {
               c->state = STATE_CONNECTING;
  -            ap_add_poll_socket(cntxt, readbits, c->aprsock, APR_POLLOUT, c->socknum);
  +            ap_add_poll_socket(readbits, c->aprsock, APR_POLLOUT, c->socknum);
               return; 
           }
           else {
  @@ -510,7 +510,7 @@
           }
       }
   
  -    ap_close_socket(cntxt, c->aprsock);
  +    ap_close_socket(c->aprsock);
   
       /* connect again */
       start_connect(c);
  @@ -527,7 +527,7 @@
       char *part;
       char respcode[4];		/* 3 digits and null */
   
  -    r = ap_recv(cntxt, c->aprsock, buffer, sizeof(buffer), aprtimeout);
  +    r = ap_recv(c->aprsock, buffer, sizeof(buffer), aprtimeout);
       if (r == 0 || (r < 0 && errno != EAGAIN)) {
           good++;
           close_connection(c);
  @@ -571,7 +571,7 @@
               }
               else {
   /* header is in invalid or too big - close connection */
  -        	ap_close_socket(cntxt, c->aprsock);
  +        	ap_close_socket(c->aprsock);
           	if (bad++ > 10) {
           	    err("\nTest aborted after 10 failures\n\n");
           	}
  @@ -747,7 +747,7 @@
           /* Timeout of 30 seconds. */
           timeout = 30;
   
  -        n = ap_poll(cntxt, readbits, concurrency, timeout);
  +        n = ap_poll(readbits, concurrency, timeout);
   
           if (!n) {
               err("\nServer timed out\n\n");
  @@ -757,7 +757,7 @@
   
           for (i = 0; i < concurrency; i++) {
               printf("rv == %d\n", rv);
  -            rv = ap_get_revents(cntxt, readbits, con[i].socknum);
  +            rv = ap_get_revents(readbits, con[i].socknum);
               printf("rv == %d\n", rv);
               if ((rv & APR_POLLERR) || (rv & APR_POLLNVAL) || (rv & APR_POLLHUP)) {
           	bad++;
  @@ -863,13 +863,13 @@
   
       /* No need to perform stat here, the apr_open will do it for us.  */  
   
  -    postlen = ap_get_filesize(cntxt, postfd);
  +    postlen = ap_get_filesize(postfd);
       postdata = malloc(postlen);
       if (!postdata) {
           printf("Can\'t alloc postfile buffer\n");
           return ENOMEM;
       }
  -    if (ap_read(cntxt, postfd, postdata, postlen) != postlen) {
  +    if (ap_read(postfd, postdata, postlen) != postlen) {
           printf("error reading postfilen");
           return EIO;
       }
  
  
  
  1.5       +14 -14    apache-apr/apr/test/client.c
  
  Index: client.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/client.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- client.c	1999/05/10 14:36:33	1.4
  +++ client.c	1999/05/24 02:04:10	1.5
  @@ -83,60 +83,60 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tClient:  Setting socket option NONBLOCK.......");
  -    if (ap_setsocketopt(context, sock, APR_SO_NONBLOCK, 1) == APR_FAILURE) {
  -        ap_close_socket(context, sock);
  +    if (ap_setsocketopt(sock, APR_SO_NONBLOCK, 1) == APR_FAILURE) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Couldn't set socket option\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tClient:  Setting port for socket.......");
  -    if (ap_setport(context, sock, 8021) == APR_FAILURE) {
  -        ap_close_socket(context, sock);
  +    if (ap_setport(sock, 8021) == APR_FAILURE) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Couldn't set the port correctly\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");           
   
       fprintf(stdout, "\tClient:  Connecting to socket.......");
  -    if (ap_connect(context, sock, "localhost") == APR_FAILURE) {
  -        ap_close_socket(context, sock);
  +    if (ap_connect(sock, "localhost") == APR_FAILURE) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Could not connect\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tClient:  Trying to send data over socket.......");
  -    if (ap_send(context, sock, datasend, STRLEN, 5) != STRLEN) {
  -        ap_close_socket(context, sock);
  +    if (ap_send(sock, datasend, STRLEN, 5) != STRLEN) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Problem sending data\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tClient:  Trying to receive data over socket.......");
  -    if (ap_recv(context, sock, datarecv, STRLEN, 5) != STRLEN) {
  -        ap_close_socket(context, sock);
  +    if (ap_recv(sock, datarecv, STRLEN, 5) != STRLEN) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Problem receiving data\n");
           exit(-1);
       }
       if (strcmp(datarecv, "Recv data test")) {
  -        ap_close_socket(context, sock);
  +        ap_close_socket(sock);
           fprintf(stderr, "I did not receive the correct data %s\n", datarecv);
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tClient:  Shutting down socket.......");
  -    if (ap_shutdown(context, sock, APR_SHUTDOWN_WRITE) == APR_FAILURE) {
  -        ap_close_socket(context, sock);
  +    if (ap_shutdown(sock, APR_SHUTDOWN_WRITE) == APR_FAILURE) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Could not shutdown socket\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tClient:  Closing down socket.......");
  -    if (ap_close_socket(context, sock) == APR_FAILURE) {
  +    if (ap_close_socket(sock) == APR_FAILURE) {
           fprintf(stderr, "Could not shutdown socket\n");
           exit(-1);
       }
  
  
  
  1.6       +28 -28    apache-apr/apr/test/server.c
  
  Index: server.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/server.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- server.c	1999/05/12 19:46:19	1.5
  +++ server.c	1999/05/24 02:04:11	1.6
  @@ -83,32 +83,32 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Setting socket option NONBLOCK.......");
  -    if (ap_setsocketopt(context, sock, APR_SO_NONBLOCK, 1) == APR_FAILURE) {
  -        ap_close_socket(context, sock);
  +    if (ap_setsocketopt(sock, APR_SO_NONBLOCK, 1) == APR_FAILURE) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Couldn't set socket option\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Setting port for socket.......");
  -    if (ap_setport(context, sock, 8021) == APR_FAILURE) {
  -        ap_close_socket(context, sock);
  +    if (ap_setport(sock, 8021) == APR_FAILURE) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Couldn't set the port correctly\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Binding socket to port.......");
  -    if (ap_bind(context, sock) == APR_FAILURE) {
  -        ap_close_socket(context, sock);
  +    if (ap_bind(sock) == APR_FAILURE) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Could not bind  %d\n", errno);
           exit(-1);
       }
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tServer:  Listening to socket.......");
  -    if (ap_listen(context, sock, 8021) == APR_FAILURE) {
  -        ap_close_socket(context, sock);
  +    if (ap_listen(sock, 8021) == APR_FAILURE) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Could not listen\n");
           exit(-1);
       }
  @@ -116,74 +116,74 @@
   
       fprintf(stdout, "\tServer:  Setting up socket for polling.......");
       sdset = ap_setup_poll(context, 1);
  -    ap_add_poll_socket(context, sdset, sock, APR_POLLIN, 0);
  +    ap_add_poll_socket(sdset, sock, APR_POLLIN, 0);
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tServer:  Beginning to poll for socket.......");
  -    rv = ap_poll(context, sdset, 1, -1); 
  +    rv = ap_poll(sdset, 1, -1); 
       if (rv == -1) {
  -        ap_close_socket(context, sock);
  +        ap_close_socket(sock);
           fprintf(stderr, "Select caused an error\n");
           exit(-1);
       }
       else if (rv == 0) {
  -        ap_close_socket(context, sock);
  +        ap_close_socket(sock);
           fprintf(stderr, "I should not return until rv == 1\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Accepting a connection.......");
  -    if ((sock2 = ap_accept(context, sock)) == NULL) {
  -        ap_close_socket(context, sock);
  +    if ((sock2 = ap_accept(sock)) == NULL) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Could not accept connection.\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Trying to recv data from socket.......");
  -    if (ap_recv(context, sock2, datasend, STRLEN, 5) != STRLEN) {
  -        ap_close_socket(context, sock);
  -        ap_close_socket(context, sock2);
  +    if (ap_recv(sock2, datasend, STRLEN, 5) != STRLEN) {
  +        ap_close_socket(sock);
  +        ap_close_socket(sock2);
           fprintf(stderr, "Problem recving data\n");
           exit(-1);
       }
       if (strcmp(datasend, "Send data test")) {
  -        ap_close_socket(context, sock);
  -        ap_close_socket(context, sock2);
  +        ap_close_socket(sock);
  +        ap_close_socket(sock2);
           fprintf(stderr, "I did not receive the correct data %s\n", datarecv);
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Sending data over socket.......");
  -    if (ap_send(context, sock2, datarecv, STRLEN, 5) != STRLEN) {
  -        ap_close_socket(context, sock);
  -        ap_close_socket(context, sock2);
  +    if (ap_send(sock2, datarecv, STRLEN, 5) != STRLEN) {
  +        ap_close_socket(sock);
  +        ap_close_socket(sock2);
           fprintf(stderr, "Problem sending data\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tServer:  Shutting down accepte socket.......");
  -    if (ap_shutdown(context, sock2, APR_SHUTDOWN_READ) == APR_FAILURE) {
  -        ap_close_socket(context, sock);
  -        ap_close_socket(context, sock2);
  +    if (ap_shutdown(sock2, APR_SHUTDOWN_READ) == APR_FAILURE) {
  +        ap_close_socket(sock);
  +        ap_close_socket(sock2);
           fprintf(stderr, "Problem shutting down\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  closing duplicate socket.......");
  -    if (ap_close_socket(context, sock2) == APR_FAILURE) {
  -        ap_close_socket(context, sock);
  +    if (ap_close_socket(sock2) == APR_FAILURE) {
  +        ap_close_socket(sock);
           fprintf(stderr, "Problem closing down\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tServer:  closing original socket.......");
  -    if (ap_close_socket(context, sock) == APR_FAILURE) {
  +    if (ap_close_socket(sock) == APR_FAILURE) {
           fprintf(stderr, "Problem closing down\n");
           exit(-1);
       }
  
  
  
  1.18      +15 -15    apache-apr/apr/test/testfile.c
  
  Index: testfile.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testfile.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- testfile.c	1999/05/13 18:38:04	1.17
  +++ testfile.c	1999/05/24 02:04:12	1.18
  @@ -94,7 +94,7 @@
           fprintf(stderr, "Bad file des\n");
           exit(-1);
       }
  -    if (strcmp(ap_get_filename(context, thefile), filename) != 0) {
  +    if (strcmp(ap_get_filename(thefile), filename) != 0) {
           fprintf(stderr, "wrong filename\n");
           exit(-1);
       }
  @@ -105,7 +105,7 @@
       fprintf(stdout, "\tWriting to file.......");
       
       nbytes = (ap_uint64_t)strlen("this is a test");
  -    rv = ap_write(context, thefile, "this is a test", nbytes);
  +    rv = ap_write(thefile, "this is a test", nbytes);
       if (rv == -1) {
           perror("something's wrong");
           exit(-1);
  @@ -119,7 +119,7 @@
       }
   
       fprintf(stdout, "\tMoving to start of file.......");
  -    if (ap_seek(context, thefile, 0, SEEK_SET) != 0) {
  +    if (ap_seek(thefile, 0, SEEK_SET) != 0) {
           perror("couldn't seek to beginning of file.");
           exit(-1);
       }
  @@ -129,7 +129,7 @@
   
       fprintf(stdout, "\tReading from the file.......");
       nbytes = (ap_uint64_t)strlen("this is a test");
  -    rv = ap_read(context, thefile, &buf, nbytes);
  +    rv = ap_read(thefile, &buf, nbytes);
       if (rv == -1) {
           perror("something's wrong");
           exit(-1);
  @@ -144,7 +144,7 @@
       }
   
       fprintf(stdout, "\tClosing File.......");
  -    status = ap_close(context, thefile);
  +    status = ap_close(thefile);
       if (status == APR_FAILURE) {
           fprintf(stderr, "Couldn't close the file\n");
           exit(-1); 
  @@ -193,7 +193,7 @@
           return APR_FAILURE;
       }
   
  -    if (ap_close(context, thefile) == APR_FAILURE) {
  +    if (ap_close(thefile) == APR_FAILURE) {
           return APR_FAILURE;
       }
   
  @@ -227,7 +227,7 @@
           return -1;
       }
   
  -    bytes = ap_write(context, file, "Another test!!", strlen("Another test!!")); 
  +    bytes = ap_write(file, "Another test!!", strlen("Another test!!")); 
   
       fprintf(stdout, "\tOpening Directory.......");
       if ((temp = ap_opendir(context, "testdir")) == NULL) {
  @@ -239,7 +239,7 @@
       }
   
       fprintf(stdout, "\tReading Directory.......");
  -    if ((ap_readdir(context, temp)) == APR_FAILURE) {
  +    if ((ap_readdir(temp)) == APR_FAILURE) {
           fprintf(stderr, "Could not read directory\n");
           return -1;
       }
  @@ -253,8 +253,8 @@
           /* Because I want the file I created, I am skipping the "." and ".."
            * files that are here. 
            */
  -        ap_readdir(context, temp); 
  -        fname = ap_get_dir_filename(context, temp);
  +        ap_readdir(temp); 
  +        fname = ap_get_dir_filename(temp);
       } while (fname[0] == '.');
       if (strcmp(fname, "testfile")) {
           fprintf(stderr, "Got wrong file name %s\n", fname);
  @@ -263,25 +263,25 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\t\tFile type.......");
  -    if (ap_dir_entry_ftype(context, temp) != APR_REG) {
  +    if (ap_dir_entry_ftype(temp) != APR_REG) {
           fprintf(stderr, "Got wrong file type\n");
           return -1;
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\t\tFile size.......");
  -    if (ap_dir_entry_size(context, temp) != bytes) {
  -        fprintf(stderr, "Got wrong file size %d\n", ap_dir_entry_size(context, temp));
  +    if (ap_dir_entry_size(temp) != bytes) {
  +        fprintf(stderr, "Got wrong file size %d\n", ap_dir_entry_size(temp));
           return -1;
       }
       fprintf(stdout, "OK\n");
        
       fprintf(stdout, "\tRewinding directory.......");
  -    ap_rewinddir(context, temp); 
  +    ap_rewinddir(temp); 
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tClosing Directory.......");
  -    if (ap_closedir(context, temp) == APR_FAILURE) {
  +    if (ap_closedir(temp) == APR_FAILURE) {
           fprintf(stderr, "Could not close directory\n");
           return -1;
       }
  
  
  
  1.5       +5 -5      apache-apr/apr/test/testproc.c
  
  Index: testproc.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testproc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testproc.c	1999/05/10 14:36:34	1.4
  +++ testproc.c	1999/05/24 02:04:12	1.5
  @@ -91,21 +91,21 @@
       fprintf(stdout, "OK.\n");
   
       fprintf(stdout, "Setting attr pipes, all three.......");
  -    if (ap_setprocattr_io(context, attr, 1, 1, 1) == APR_FAILURE) {
  +    if (ap_setprocattr_io(attr, 1, 1, 1) == APR_FAILURE) {
           fprintf(stderr, "Could not set pipes attr\n");
           exit(-1);
       }
       fprintf(stdout, "OK.\n");
       
       fprintf(stdout, "Setting attr dir.......");
  -    if (ap_setprocattr_dir(context, attr, "proctest") == APR_FAILURE) {
  +    if (ap_setprocattr_dir(attr, "proctest") == APR_FAILURE) {
           fprintf(stderr, "Could not set directory attr\n");
           exit(-1);
       }
       fprintf(stdout, "OK.\n");
   
       fprintf(stdout, "Setting attr cmd type.......");
  -    if (ap_setprocattr_cmdtype(context, attr, APR_PROGRAM) == APR_FAILURE) {
  +    if (ap_setprocattr_cmdtype(attr, APR_PROGRAM) == APR_FAILURE) {
           fprintf(stderr, "Could not set cmd type attr\n");
           exit(-1);
       }
  @@ -123,14 +123,14 @@
       fprintf(stdout, "OK.\n");
   
       fprintf(stdout, "Grabbing child's stdout.......");
  -    if ((testfile = ap_get_childout(context, newproc)) == NULL) {
  +    if ((testfile = ap_get_childout(newproc)) == NULL) {
           fprintf(stderr, "Could not get child's stdout\n");
           exit(-1);
       }
       fprintf(stdout, "OK.\n");
       
       fprintf(stdout, "Checking the data read from pipe to child.......");
  -    rv = ap_read(context, testfile, buf, 256);
  +    rv = ap_read(testfile, buf, 256);
       buf[rv] = '\0';
       if (!strcmp(buf, teststr))
           fprintf(stdout,"OK\n");
  
  
  
  1.8       +6 -6      apache-apr/apr/test/testsock.c
  
  Index: testsock.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testsock.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- testsock.c	1999/05/21 19:53:50	1.7
  +++ testsock.c	1999/05/24 02:04:13	1.8
  @@ -97,17 +97,17 @@
           exit(-1);
       }
   
  -    while ((s1 = ap_wait_proc(context, proc1, APR_NOWAIT)) == APR_FAILURE &&
  -           (s2 = ap_wait_proc(context, proc2, APR_NOWAIT)) == APR_FAILURE)
  +    while ((s1 = ap_wait_proc(proc1, APR_NOWAIT)) == APR_FAILURE &&
  +           (s2 = ap_wait_proc(proc2, APR_NOWAIT)) == APR_FAILURE)
           continue;
   
       if (s1 == APR_SUCCESS) {
  -        ap_kill(context,proc2, SIGTERM);
  -        ap_wait_proc(context, proc2, APR_WAIT);
  +        ap_kill(proc2, SIGTERM);
  +        ap_wait_proc(proc2, APR_WAIT);
       }
       else {
  -        ap_kill(context, proc1, SIGTERM);
  -        ap_wait_proc(context, proc1, APR_WAIT);
  +        ap_kill(proc1, SIGTERM);
  +        ap_wait_proc(proc1, APR_WAIT);
       }
       fprintf(stdout, "Network test completed.\n");   
   }
  
  
  
  1.2       +12 -12    apache-apr/apr/test/testthread.c
  
  Index: testthread.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testthread.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testthread.c	1999/05/17 13:11:51	1.1
  +++ testthread.c	1999/05/24 02:04:13	1.2
  @@ -70,9 +70,9 @@
   {
       int i;
       for (i = 0; i < 10000; i++) {
  -        ap_lock(context, thread_lock);
  +        ap_lock(thread_lock);
           x++;
  -        ap_unlock(context, thread_lock);
  +        ap_unlock(thread_lock);
       }
   } 
   
  @@ -80,9 +80,9 @@
   {
       int i;
       for (i = 0; i < 10000; i++) {
  -        ap_lock(context, thread_lock);
  +        ap_lock(thread_lock);
           x++;
  -        ap_unlock(context, thread_lock);
  +        ap_unlock(thread_lock);
       }
   } 
   
  @@ -90,9 +90,9 @@
   {
       int i;
       for (i = 0; i < 10000; i++) {
  -        ap_lock(context, thread_lock);
  +        ap_lock(thread_lock);
           x++;
  -        ap_unlock(context, thread_lock);
  +        ap_unlock(thread_lock);
       }
   } 
   
  @@ -100,9 +100,9 @@
   {
       int i;
       for (i = 0; i < 10000; i++) {
  -        ap_lock(context, thread_lock);
  +        ap_lock(thread_lock);
           x++;
  -        ap_unlock(context, thread_lock);
  +        ap_unlock(thread_lock);
       }
   } 
   
  @@ -143,10 +143,10 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "Waiting for threads to exit.......");
  -    ap_thread_join(context, t1, &st);
  -    ap_thread_join(context, t2, &st);
  -    ap_thread_join(context, t3, &st);
  -    ap_thread_join(context, t4, &st);
  +    ap_thread_join(t1, &st);
  +    ap_thread_join(t2, &st);
  +    ap_thread_join(t3, &st);
  +    ap_thread_join(t4, &st);
       fprintf (stdout, "OK\n");   
   
       fprintf(stdout, "Checking if locks worked......."); 
  
  
  
  1.2       +19 -19    apache-apr/apr/test/testtime.c
  
  Index: testtime.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/test/testtime.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testtime.c	1999/05/16 13:29:14	1.1
  +++ testtime.c	1999/05/24 02:04:13	1.2
  @@ -82,14 +82,14 @@
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tGetting current time.......");
  -    if (ap_current_time(context, time) == APR_FAILURE) {
  +    if (ap_current_time(time) == APR_FAILURE) {
           fprintf(stderr, "Couldn't get the time\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tExploding Current time.......");
  -    if (ap_explode_time(context, time, APR_UTCTIME) == APR_FAILURE) {
  +    if (ap_explode_time(time, APR_UTCTIME) == APR_FAILURE) {
           fprintf(stderr, "Couldn't explode the time\n");
           exit(-1);
       }
  @@ -97,78 +97,78 @@
   
       time2 = ap_make_time(context);
       fprintf(stdout, "\tGetting the number of seconds.......");
  -    rv = ap_get_sec(context, time);
  +    rv = ap_get_sec(time);
       if (rv < 0) {
           fprintf(stderr, "Couldn't get the seconds\n");
           exit(-1);
       }
  -    ap_set_sec(context, time2, rv);
  +    ap_set_sec(time2, rv);
       fprintf(stdout, "OK\n"); 
   
       fprintf(stdout, "\tGetting the number of minutes.......");
  -    rv = ap_get_min(context, time);
  +    rv = ap_get_min(time);
       if (rv < 0) {
           fprintf(stderr, "Couldn't get the minutes\n");
           exit(-1);
       }
  -    ap_set_min(context, time2, rv);
  +    ap_set_min(time2, rv);
       fprintf(stdout, "OK\n"); 
   
       fprintf(stdout, "\tGetting the number of hours.......");
  -    rv = ap_get_hour(context, time);
  +    rv = ap_get_hour(time);
       if (rv < 0) {
           fprintf(stderr, "Couldn't get the hours\n");
           exit(-1);
       }
  -    ap_set_hour(context, time2, rv);
  +    ap_set_hour(time2, rv);
       fprintf(stdout, "OK\n"); 
   
       fprintf(stdout, "\tGetting the number of days.......");
  -    rv = ap_get_mday(context, time);
  +    rv = ap_get_mday(time);
       if (rv < 0) {
           fprintf(stderr, "Couldn't get the days\n");
           exit(-1);
       }
  -    ap_set_mday(context, time2, rv);
  +    ap_set_mday(time2, rv);
       fprintf(stdout, "OK\n"); 
   
       fprintf(stdout, "\tGetting the month .......");
  -    rv = ap_get_mon(context, time);
  +    rv = ap_get_mon(time);
       if (rv < 0) {
           fprintf(stderr, "Couldn't get the month\n");
           exit(-1);
       }
  -    ap_set_mon(context, time2, rv);
  +    ap_set_mon(time2, rv);
       fprintf(stdout, "OK\n"); 
   
       fprintf(stdout, "\tGetting the year.......");
  -    rv = ap_get_year(context, time);
  +    rv = ap_get_year(time);
       if (rv < 0) {
           fprintf(stderr, "Couldn't get the year\n");
           exit(-1);
       }
  -    ap_set_year(context, time2, rv);
  +    ap_set_year(time2, rv);
       fprintf(stdout, "OK\n"); 
   
       fprintf(stdout, "\tGetting the weekday.......");
  -    rv = ap_get_wday(context, time);
  +    rv = ap_get_wday(time);
       if (rv < 0) {
           fprintf(stderr, "Couldn't get the week day\n");
           exit(-1);
       }
  -    ap_set_wday(context, time2, rv);
  +    ap_set_wday(time2, rv);
       fprintf(stdout, "OK\n"); 
   
       fprintf(stdout, "\tImploding the time.......");
  -    if (ap_implode_time(context, time2) == APR_FAILURE) {
  +    if (ap_implode_time(time2) == APR_FAILURE) {
           fprintf(stderr, "Couldn't implode time\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tComparing two time values.......");
  -    t1 = ap_get_curtime(context, time);
  -    t2 = ap_get_curtime(context, time2);
  +    t1 = ap_get_curtime(time);
  +    t2 = ap_get_curtime(time2);
       if ((t1 == -1) || (t2 == -1) || (t1 != t2)) {
           fprintf(stderr, "Values don't match\n");
           exit(-1);
  
  
  
  1.2       +8 -8      apache-apr/apr/threadproc/beos/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/threadproc/beos/proc.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- proc.c	1999/05/17 18:46:46	1.1
  +++ proc.c	1999/05/24 02:04:17	1.2
  @@ -77,7 +77,7 @@
       return new;
   }
   
  -ap_status_t ap_setprocattr_io(ap_context_t *cont, struct procattr_t *attr, ap_int32_t in, 
  +ap_status_t ap_setprocattr_io(struct procattr_t *attr, ap_int32_t in, 
                                    ap_int32_t out, ap_int32_t err)
   {
       if (in) {
  @@ -112,19 +112,19 @@
       } 
   }
   
  -ap_status_t ap_setprocattr_dir(ap_context_t *cont, struct procattr_t *attr, 
  +ap_status_t ap_setprocattr_dir(struct procattr_t *attr, 
                                    char *dir) 
   {
       attr->currdir = strdup(dir);
   }
   
  -ap_status_t ap_setprocattr_cmdtype(ap_context_t *cont, struct procattr_t *attr,
  +ap_status_t ap_setprocattr_cmdtype(struct procattr_t *attr,
                                        ap_cmdtype_e cmd) 
   {
       attr->cmdtype = cmd;
   }
   
  -ap_int32_t ap_fork(ap_context_t *cont, struct proc_t *proc)
  +ap_int32_t ap_fork(struct proc_t *proc)
   {
       int pid;
   
  @@ -215,22 +215,22 @@
       return new;
   }
   
  -ap_file_t *ap_get_childin(ap_context_t *cont, struct proc_t *proc)
  +ap_file_t *ap_get_childin(struct proc_t *proc)
   {
       return proc->attr->parent_in; 
   }
   
  -ap_file_t *ap_get_childout(ap_context_t *cont, struct proc_t *proc)
  +ap_file_t *ap_get_childout(struct proc_t *proc)
   {
       return proc->attr->parent_out; 
   }
   
  -ap_file_t *ap_get_childerr(ap_context_t *cont, struct proc_t *proc)
  +ap_file_t *ap_get_childerr(struct proc_t *proc)
   {
       return proc->attr->parent_err; 
   }    
   
  -ap_status_t ap_wait_proc(ap_context_t *cont, struct proc_t *proc, 
  +ap_status_t ap_wait_proc(struct proc_t *proc, 
                              ap_wait_how_e wait)
   {
       if (!proc)
  
  
  
  1.2       +3 -3      apache-apr/apr/threadproc/beos/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/threadproc/beos/thread.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- thread.c	1999/05/17 18:46:46	1.1
  +++ thread.c	1999/05/24 02:04:17	1.2
  @@ -67,7 +67,7 @@
   	new->attr = (int32)B_NORMAL_PRIORITY;
   }
   
  -ap_status_t ap_setthreadattr_detach(ap_context_t *cont, struct threadattr_t *attr, ap_int32_t on)
  +ap_status_t ap_setthreadattr_detach(struct threadattr_t *attr, ap_int32_t on)
   {
   	if (on == 1){
   		attr -> detached = 1;
  @@ -77,7 +77,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_getthreadattr_detach(ap_context_t *cont, struct threadattr_t *attr)
  +ap_status_t ap_getthreadattr_detach(struct threadattr_t *attr)
   {
   	if (attr->detached == 1){
   		return APR_SUCCESS;
  @@ -85,7 +85,7 @@
   	return APR_FAILURE;
   }
   
  -struct thread_t *ap_create_thread(ap_context_t *cont, struct threadattr_t *attr, ap_thread_start_t func, void *data)
  +struct thread_t *ap_create_thread(struct threadattr_t *attr, ap_thread_start_t func, void *data)
   {
       struct thread_t *new;
   
  
  
  
  1.2       +1 -1      apache-apr/apr/threadproc/beos/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/threadproc/beos/threadcancel.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- threadcancel.c	1999/05/17 18:46:47	1.1
  +++ threadcancel.c	1999/05/24 02:04:18	1.2
  @@ -58,7 +58,7 @@
   #include "apr_general.h"
   
   
  -ap_status_t ap_cancel_thread(ap_context_t *cont, struct thread_t *thd)
  +ap_status_t ap_cancel_thread(struct thread_t *thd)
   {
       if (kill_thread(thd->td) == 0) {
           return APR_SUCCESS;
  
  
  
  1.2       +3 -3      apache-apr/apr/threadproc/beos/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/threadproc/beos/threadpriv.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- threadpriv.c	1999/05/17 18:46:47	1.1
  +++ threadpriv.c	1999/05/24 02:04:18	1.2
  @@ -81,7 +81,7 @@
       return NULL;
   }
   
  -void *ap_get_thread_private(ap_context_t *cont, struct threadkey_t *key)
  +void *ap_get_thread_private(struct threadkey_t *key)
   {
   	void * data;
   	thread_id tid;
  @@ -114,7 +114,7 @@
   	return data;
   }
   
  -ap_status_t ap_set_thread_private(ap_context_t *cont, struct threadkey_t *key, void *priv)
  +ap_status_t ap_set_thread_private(struct threadkey_t *key, void *priv)
   {
   	thread_id tid;
   	int i,index = 0, ret;
  @@ -169,7 +169,7 @@
   	return APR_FAILURE;
   }
   
  -ap_status_t ap_delete_thread_private(ap_context_t *cont, struct threadkey_t *key)
  +ap_status_t ap_delete_thread_private(struct threadkey_t *key)
   {
   	if (key->key < BEOS_MAX_DATAKEYS){
   		acquire_sem(key_table[key->key].lock);
  
  
  
  1.12      +26 -26    apache-apr/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/threadproc/unix/proc.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- proc.c	1999/05/21 19:53:54	1.11
  +++ proc.c	1999/05/24 02:04:19	1.12
  @@ -79,54 +79,54 @@
       return new;
   }
   
  -ap_status_t ap_setprocattr_io(ap_context_t *cont, struct procattr_t *attr, ap_int32_t in, 
  +ap_status_t ap_setprocattr_io(struct procattr_t *attr, ap_int32_t in, 
                                    ap_int32_t out, ap_int32_t err)
   {
       if (in) {
  -        attr->parent_in = (ap_file_t *)ap_palloc(cont->pool, 
  +        attr->parent_in = (ap_file_t *)ap_palloc(attr->cntxt->pool, 
                                                      sizeof(ap_file_t));
  -        attr->child_in = (ap_file_t *)ap_palloc(cont->pool, 
  +        attr->child_in = (ap_file_t *)ap_palloc(attr->cntxt->pool, 
                                                     sizeof(ap_file_t));
  -        if (ap_create_pipe(cont, attr->child_in, 
  +        if (ap_create_pipe(attr->cntxt, attr->child_in, 
                               attr->parent_in) == APR_FAILURE) {
               return APR_FAILURE;
           }
       } 
       if (out) {
  -        attr->parent_out = (ap_file_t *)ap_palloc(cont->pool, 
  +        attr->parent_out = (ap_file_t *)ap_palloc(attr->cntxt->pool, 
                                                       sizeof(ap_file_t));
  -        attr->child_out = (ap_file_t *)ap_palloc(cont->pool, 
  +        attr->child_out = (ap_file_t *)ap_palloc(attr->cntxt->pool, 
                                                      sizeof(ap_file_t));
  -        if (ap_create_pipe(cont, attr->parent_out, 
  +        if (ap_create_pipe(attr->cntxt, attr->parent_out, 
                               attr->child_out) == APR_FAILURE) {
               return APR_FAILURE;
           }
       } 
       if (err) {
  -        attr->parent_err = (ap_file_t *)ap_palloc(cont->pool, 
  +        attr->parent_err = (ap_file_t *)ap_palloc(attr->cntxt->pool, 
                                                       sizeof(ap_file_t));
  -        attr->child_err = (ap_file_t *)ap_palloc(cont->pool, 
  +        attr->child_err = (ap_file_t *)ap_palloc(attr->cntxt->pool, 
                                                      sizeof(ap_file_t));
  -        if (ap_create_pipe(cont, attr->parent_err, 
  +        if (ap_create_pipe(attr->cntxt, attr->parent_err, 
                               attr->child_err) == APR_FAILURE) {
               return APR_FAILURE;
           }
       } 
   }
   
  -ap_status_t ap_setprocattr_dir(ap_context_t *cont, struct procattr_t *attr, 
  +ap_status_t ap_setprocattr_dir(struct procattr_t *attr, 
                                    char *dir) 
   {
       attr->currdir = strdup(dir);
   }
   
  -ap_status_t ap_setprocattr_cmdtype(ap_context_t *cont, struct procattr_t *attr,
  +ap_status_t ap_setprocattr_cmdtype(struct procattr_t *attr,
                                        ap_cmdtype_e cmd) 
   {
       attr->cmdtype = cmd;
   }
   
  -ap_int32_t ap_fork(ap_context_t *cont, struct proc_t *proc)
  +ap_int32_t ap_fork(struct proc_t *proc)
   {
       int pid;
   
  @@ -157,19 +157,19 @@
       else if (new->pid == 0) { 
           /* child process */
           if (attr->child_in) {
  -            ap_close(cont, attr->parent_in);
  +            ap_close(attr->parent_in);
               dup2(attr->child_in->filedes, STDIN_FILENO);
  -            ap_close(cont, attr->child_in);
  +            ap_close(attr->child_in);
           }
           if (attr->child_out) {
  -            ap_close(cont, attr->parent_out);
  +            ap_close(attr->parent_out);
               dup2(attr->child_out->filedes, STDOUT_FILENO);
  -            ap_close(cont, attr->child_out);
  +            ap_close(attr->child_out);
           }
           if (attr->child_err) {
  -            ap_close(cont, attr->parent_err);
  +            ap_close(attr->parent_err);
               dup2(attr->child_err->filedes, STDERR_FILENO);
  -            ap_close(cont, attr->child_err);
  +            ap_close(attr->child_err);
           }
           
           signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
  @@ -203,35 +203,35 @@
       }
       /* Parent process */
       if (attr->child_in) {
  -        ap_close(cont, attr->child_in);
  +        ap_close(attr->child_in);
       }
       if (attr->child_out) {
  -        ap_close(cont, attr->child_out);
  +        ap_close(attr->child_out);
       }
       if (attr->child_err) {
  -        ap_close(cont, attr->child_err);
  +        ap_close(attr->child_err);
       }
       
       new->attr = attr;
       return new;
   }
   
  -ap_file_t *ap_get_childin(ap_context_t *cont, struct proc_t *proc)
  +ap_file_t *ap_get_childin(struct proc_t *proc)
   {
       return proc->attr->parent_in; 
   }
   
  -ap_file_t *ap_get_childout(ap_context_t *cont, struct proc_t *proc)
  +ap_file_t *ap_get_childout(struct proc_t *proc)
   {
       return proc->attr->parent_out; 
   }
   
  -ap_file_t *ap_get_childerr(ap_context_t *cont, struct proc_t *proc)
  +ap_file_t *ap_get_childerr(struct proc_t *proc)
   {
       return proc->attr->parent_err; 
   }    
   
  -ap_status_t ap_wait_proc(ap_context_t *cont, struct proc_t *proc, 
  +ap_status_t ap_wait_proc(struct proc_t *proc, 
                              ap_wait_how_e wait)
   {
       if (!proc)
  
  
  
  1.3       +1 -1      apache-apr/apr/threadproc/unix/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/threadproc/unix/signals.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- signals.c	1999/05/21 19:53:55	1.2
  +++ signals.c	1999/05/24 02:04:19	1.3
  @@ -62,7 +62,7 @@
   #include <string.h>
   #include <sys/wait.h>
   
  -void ap_kill(ap_context_t *cont, struct proc_t *proc, int signal)
  +void ap_kill(struct proc_t *proc, int signal)
   {
       kill(proc->pid, signal);
   }
  
  
  
  1.5       +4 -4      apache-apr/apr/threadproc/unix/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/threadproc/unix/thread.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- thread.c	1999/05/21 19:53:55	1.4
  +++ thread.c	1999/05/24 02:04:20	1.5
  @@ -68,7 +68,7 @@
       pthread_attr_init(new->attr);
   }
   
  -ap_status_t ap_setthreadattr_detach(ap_context_t *cont, struct threadattr_t *attr, ap_int32_t on)
  +ap_status_t ap_setthreadattr_detach(struct threadattr_t *attr, ap_int32_t on)
   {
       if (pthread_attr_setdetachstate(attr->attr, on) == 0) {
           return APR_SUCCESS;
  @@ -78,7 +78,7 @@
       }
   }
   
  -ap_status_t ap_getthreadattr_detach(ap_context_t *cont, struct threadattr_t *attr)
  +ap_status_t ap_getthreadattr_detach(struct threadattr_t *attr)
   {
       int state;
   
  @@ -116,7 +116,7 @@
       pthread_exit(retval);
   }
   
  -ap_status_t ap_thread_join(ap_context_t *cont, struct thread_t *thd, ap_status_t *retval)
  +ap_status_t ap_thread_join(struct thread_t *thd, ap_status_t *retval)
   {
       if (pthread_join(*thd->td,(void *)&retval) == 0) {
           return APR_SUCCESS;
  @@ -126,7 +126,7 @@
       }
   }
   
  -ap_status_t ap_thread_detach(ap_context_t *cont, struct thread_t *thd)
  +ap_status_t ap_thread_detach(struct thread_t *thd)
   {
       if (pthread_detach(*thd->td) == 0) {
           return APR_SUCCESS;
  
  
  
  1.3       +1 -1      apache-apr/apr/threadproc/unix/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/threadproc/unix/threadcancel.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- threadcancel.c	1999/05/12 20:04:25	1.2
  +++ threadcancel.c	1999/05/24 02:04:20	1.3
  @@ -58,7 +58,7 @@
   #include "apr_general.h"
   
   
  -ap_status_t ap_cancel_thread(ap_context_t *cont, struct thread_t *thd)
  +ap_status_t ap_cancel_thread(struct thread_t *thd)
   {
       if (pthread_cancel(*thd->td) == 0) {
           return APR_SUCCESS;
  
  
  
  1.4       +3 -3      apache-apr/apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- threadpriv.c	1999/05/21 19:53:56	1.3
  +++ threadpriv.c	1999/05/24 02:04:20	1.4
  @@ -70,12 +70,12 @@
       return NULL;
   }
   
  -void *ap_get_thread_private(ap_context_t *cont, struct threadkey_t *key)
  +void *ap_get_thread_private(struct threadkey_t *key)
   {
       return pthread_getspecific(key->key);
   }
   
  -ap_status_t ap_set_thread_private(ap_context_t *cont, struct threadkey_t *key, void *priv)
  +ap_status_t ap_set_thread_private(struct threadkey_t *key, void *priv)
   {
       if (pthread_setspecific(key->key, priv)== 0) {
           return APR_SUCCESS;
  @@ -85,7 +85,7 @@
       }
   }
   
  -ap_status_t ap_delete_thread_private(ap_context_t *cont, struct threadkey_t *key)
  +ap_status_t ap_delete_thread_private(struct threadkey_t *key)
   {
       if (pthread_key_delete(key->key) == 0) {
           return APR_SUCCESS; 
  
  
  
  1.3       +15 -15    apache-apr/apr/time/unix/access.c
  
  Index: access.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/time/unix/access.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- access.c	1999/05/21 19:54:03	1.2
  +++ access.c	1999/05/24 02:04:22	1.3
  @@ -60,47 +60,47 @@
   #include <errno.h>
   #include <string.h>
   
  -ap_int64_t ap_get_curtime(ap_context_t *context, struct atime_t *time)
  +ap_int64_t ap_get_curtime(struct atime_t *time)
   {
       return time->currtime;
   }
   
  -ap_int32_t ap_get_sec(ap_context_t *context, struct atime_t *time)
  +ap_int32_t ap_get_sec(struct atime_t *time)
   {
       return time->explodedtime->tm_sec;
   }
   
  -ap_int32_t ap_get_min(ap_context_t *context, struct atime_t *time)
  +ap_int32_t ap_get_min(struct atime_t *time)
   {
       return time->explodedtime->tm_min;
   }
   
  -ap_int32_t ap_get_hour(ap_context_t *context, struct atime_t *time)
  +ap_int32_t ap_get_hour(struct atime_t *time)
   {
       return time->explodedtime->tm_hour;
   }
   
  -ap_int32_t ap_get_mday(ap_context_t *context, struct atime_t *time)
  +ap_int32_t ap_get_mday(struct atime_t *time)
   {
       return time->explodedtime->tm_mday;
   }
   
  -ap_int32_t ap_get_mon(ap_context_t *context, struct atime_t *time)
  +ap_int32_t ap_get_mon(struct atime_t *time)
   {
       return time->explodedtime->tm_mon;
   }
   
  -ap_int32_t ap_get_year(ap_context_t *context, struct atime_t *time)
  +ap_int32_t ap_get_year(struct atime_t *time)
   {
       return time->explodedtime->tm_year;
   }
   
  -ap_int32_t ap_get_wday(ap_context_t *context, struct atime_t *time)
  +ap_int32_t ap_get_wday(struct atime_t *time)
   {
       return time->explodedtime->tm_wday;
   }
   
  -void ap_set_sec(ap_context_t *context, struct atime_t *time, ap_int32_t value)
  +void ap_set_sec(struct atime_t *time, ap_int32_t value)
   {
       if (time->explodedtime == NULL) {
           time->explodedtime = (struct tm *)ap_palloc(time->cntxt->pool, 
  @@ -109,7 +109,7 @@
       time->explodedtime->tm_sec = value;
   }
   
  -void ap_set_min(ap_context_t *context, struct atime_t *time, ap_int32_t value)
  +void ap_set_min(struct atime_t *time, ap_int32_t value)
   {
       if (time->explodedtime == NULL) {
           time->explodedtime = (struct tm *)ap_palloc(time->cntxt->pool, 
  @@ -118,7 +118,7 @@
       time->explodedtime->tm_min = value;
   }
   
  -void ap_set_hour(ap_context_t *context, struct atime_t *time, ap_int32_t value)
  +void ap_set_hour(struct atime_t *time, ap_int32_t value)
   {
       if (time->explodedtime == NULL) {
           time->explodedtime = (struct tm *)ap_palloc(time->cntxt->pool, 
  @@ -127,7 +127,7 @@
       time->explodedtime->tm_hour = value;
   }
   
  -void ap_set_mday(ap_context_t *context, struct atime_t *time, ap_int32_t value)
  +void ap_set_mday(struct atime_t *time, ap_int32_t value)
   {
       if (time->explodedtime == NULL) {
           time->explodedtime = (struct tm *)ap_palloc(time->cntxt->pool, 
  @@ -136,7 +136,7 @@
       time->explodedtime->tm_mday = value;
   }
   
  -void ap_set_mon(ap_context_t *context, struct atime_t *time, ap_int32_t value)
  +void ap_set_mon(struct atime_t *time, ap_int32_t value)
   {
       if (time->explodedtime == NULL) {
           time->explodedtime = (struct tm *)ap_palloc(time->cntxt->pool, 
  @@ -145,7 +145,7 @@
       time->explodedtime->tm_mon = value;
   }
   
  -void ap_set_year(ap_context_t *context, struct atime_t *time, ap_int32_t value)
  +void ap_set_year(struct atime_t *time, ap_int32_t value)
   {
       if (time->explodedtime == NULL) {
           time->explodedtime = (struct tm *)ap_palloc(time->cntxt->pool, 
  @@ -154,7 +154,7 @@
       time->explodedtime->tm_year = value;
   }
   
  -void ap_set_wday(ap_context_t *context, struct atime_t *time, ap_int32_t value)
  +void ap_set_wday(struct atime_t *time, ap_int32_t value)
   {
       if (time->explodedtime == NULL) {
           time->explodedtime = (struct tm *)ap_palloc(time->cntxt->pool, 
  
  
  
  1.3       +3 -3      apache-apr/apr/time/unix/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/time/unix/time.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- time.c	1999/05/21 19:54:04	1.2
  +++ time.c	1999/05/24 02:04:22	1.3
  @@ -71,7 +71,7 @@
       return new;
   }
   
  -ap_status_t ap_current_time(ap_context_t *context, struct atime_t *new)
  +ap_status_t ap_current_time(struct atime_t *new)
   {
       if (time(&new->currtime) == -1) {
           return APR_FAILURE;
  @@ -79,7 +79,7 @@
       return APR_SUCCESS; 
   }       
   
  -ap_status_t ap_explode_time(ap_context_t *context, struct atime_t *time, ap_timetype_e type)
  +ap_status_t ap_explode_time(struct atime_t *time, ap_timetype_e type)
   {
       switch (type) {
       case APR_LOCALTIME: {
  @@ -94,7 +94,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_implode_time(ap_context_t *context, struct atime_t *time)
  +ap_status_t ap_implode_time(struct atime_t *time)
   {
       int year;
       time_t days;
  
  
  
  1.28      +23 -23    apache-apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_file_io.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- apr_file_io.h	1999/05/19 17:34:20	1.27
  +++ apr_file_io.h	1999/05/24 02:04:23	1.28
  @@ -105,22 +105,22 @@
   
   /*   Function definitions */
   ap_file_t *ap_open(ap_context_t *, char *, ap_int32_t, ap_fileperms_t);
  -ap_status_t ap_close(ap_context_t *, ap_file_t *);
  +ap_status_t ap_close(ap_file_t *);
   ap_status_t ap_remove_file(ap_context_t *, char *);
   
  -ap_ssize_t ap_read(ap_context_t *, ap_file_t *, void *, ap_ssize_t);
  -ap_ssize_t ap_write(ap_context_t *, ap_file_t *, void *, ap_ssize_t);
  -ap_ssize_t ap_writev(ap_context_t *, ap_file_t *, const ap_iovec_t *, ap_ssize_t);
  -
  -ap_file_t *ap_dupfile(ap_context_t *, ap_file_t *);
  -ap_status_t ap_getfileinfo(ap_context_t *, char *, ap_file_t *);
  -ap_status_t ap_updatefileinfo(ap_context_t *, ap_file_t *);
  -ap_off_t ap_seek(ap_context_t *, ap_file_t *, ap_off_t, ap_seek_where_t);
  +ap_ssize_t ap_read(ap_file_t *, void *, ap_ssize_t);
  +ap_ssize_t ap_write(ap_file_t *, void *, ap_ssize_t);
  +ap_ssize_t ap_writev(ap_file_t *, const ap_iovec_t *, ap_ssize_t);
  +
  +ap_file_t *ap_dupfile(ap_file_t *);
  +ap_status_t ap_getfileinfo(ap_file_t *);
  +ap_status_t ap_updatefileinfo(ap_file_t *);
  +ap_off_t ap_seek(ap_file_t *, ap_off_t, ap_seek_where_t);
   
   ap_dir_t *ap_opendir(ap_context_t *, const char *);
  -ap_status_t ap_closedir(ap_context_t *, ap_dir_t *);
  -ap_status_t ap_readdir(ap_context_t *, ap_dir_t *);
  -ap_status_t ap_rewinddir(ap_context_t *, ap_dir_t *);
  +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 *);
   
  @@ -128,18 +128,18 @@
   char *ap_create_namedpipe(ap_context_t *, char *, ap_fileperms_t);
   
   /*accessor and general file_io functions. */
  -char *ap_get_filename(ap_context_t *, ap_file_t *);
  -char *ap_get_dir_filename(ap_context_t *, ap_dir_t *);
  +char *ap_get_filename(ap_file_t *);
  +char *ap_get_dir_filename(ap_dir_t *);
   
  -ap_ssize_t ap_dir_entry_size(ap_context_t *, ap_dir_t *);
  -time_t ap_dir_entry_mtime(ap_context_t *, ap_dir_t *);
  -ap_filetype_e ap_dir_entry_ftype(ap_context_t *, ap_dir_t *);
  -
  -ap_ssize_t ap_get_filesize(ap_context_t *, ap_file_t *);
  -ap_fileperms_t ap_get_fileperms(ap_context_t *, ap_file_t *);
  -time_t ap_get_fileatime(ap_context_t *, ap_file_t *);
  -time_t ap_get_filectime(ap_context_t *, ap_file_t *);
  -time_t ap_get_filemtime(ap_context_t *, ap_file_t *);
  +ap_ssize_t ap_dir_entry_size(ap_dir_t *);
  +time_t ap_dir_entry_mtime(ap_dir_t *);
  +ap_filetype_e ap_dir_entry_ftype(ap_dir_t *);
  +
  +ap_ssize_t ap_get_filesize(ap_file_t *);
  +ap_fileperms_t ap_get_fileperms(ap_file_t *);
  +time_t ap_get_fileatime(ap_file_t *);
  +time_t ap_get_filectime(ap_file_t *);
  +time_t ap_get_filemtime(ap_file_t *);
   
   #ifdef __cplusplus
   }
  
  
  
  1.2       +3 -3      apache-apr/include/apr_lock.h
  
  Index: apr_lock.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_lock.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_lock.h	1999/05/12 12:00:11	1.1
  +++ apr_lock.h	1999/05/24 02:04:23	1.2
  @@ -69,9 +69,9 @@
   
   /*   Function definitions */
   ap_lock_t *ap_create_lock(ap_context_t *, ap_locktype_e, char *);
  -ap_status_t ap_lock(ap_context_t *, ap_lock_t *);
  -ap_status_t ap_unlock(ap_context_t *, ap_lock_t *);
  -ap_status_t ap_destroy_lock(ap_context_t *, ap_lock_t *);
  +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 *);
   
   #ifdef __cplusplus
   }
  
  
  
  1.21      +14 -14    apache-apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_network_io.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- apr_network_io.h	1999/05/20 18:01:34	1.20
  +++ apr_network_io.h	1999/05/24 02:04:23	1.21
  @@ -94,27 +94,27 @@
   /* function definitions */
   
   ap_socket_t *ap_create_tcp_socket(ap_context_t *);
  -ap_status_t ap_shutdown(ap_context_t *, ap_socket_t *, ap_shutdown_how_e);
  -ap_status_t ap_close_socket(ap_context_t *, ap_socket_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_context_t *, ap_socket_t *);
  -ap_status_t ap_listen(ap_context_t *, ap_socket_t *, ap_int32_t);
  -ap_socket_t *ap_accept(ap_context_t *, const ap_socket_t *);
  -ap_status_t ap_connect(ap_context_t *, ap_socket_t *, char *);
  +ap_status_t ap_bind(ap_socket_t *);
  +ap_status_t ap_listen(ap_socket_t *, ap_int32_t);
  +ap_socket_t *ap_accept(const ap_socket_t *);
  +ap_status_t ap_connect(ap_socket_t *, char *);
   
  -char *aprget_remote_hostname(ap_context_t *, ap_socket_t *);
  +char *aprget_remote_hostname(ap_socket_t *);
   ap_status_t ap_gethostname(ap_context_t *, char *, int);
   
  -ap_ssize_t ap_send(ap_context_t *, ap_socket_t *, const char *, int, time_t);
  -ap_ssize_t ap_recv(ap_context_t *, ap_socket_t *, char *, int, time_t);
  +ap_ssize_t ap_send(ap_socket_t *, const char *, int, time_t);
  +ap_ssize_t ap_recv(ap_socket_t *, char *, int, time_t);
   
  -ap_status_t ap_setsocketopt(ap_context_t *, ap_socket_t *, ap_int32_t, ap_int32_t);
  -ap_status_t ap_setport(ap_context_t *, ap_socket_t *, ap_uint32_t);
  +ap_status_t ap_setsocketopt(ap_socket_t *, ap_int32_t, ap_int32_t);
  +ap_status_t ap_setport(ap_socket_t *, ap_uint32_t);
   
   ap_pollfd_t *ap_setup_poll(ap_context_t *, ap_int32_t);
  -ap_int32_t ap_poll(ap_context_t *, ap_pollfd_t *, ap_int32_t, ap_int32_t);
  -void ap_add_poll_socket(ap_context_t *, ap_pollfd_t *, ap_socket_t *, ap_int16_t, ap_int32_t);
  -ap_int16_t ap_get_revents(ap_context_t *, ap_pollfd_t *, ap_int32_t);
  +ap_int32_t ap_poll(ap_pollfd_t *, ap_int32_t, ap_int32_t);
  +void ap_add_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t, ap_int32_t);
  +ap_int16_t ap_get_revents(ap_pollfd_t *, ap_int32_t);
   
   /*  accessor functions   */
   
  
  
  
  1.11      +13 -13    apache-apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_thread_proc.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_thread_proc.h	1999/05/21 13:02:33	1.10
  +++ apr_thread_proc.h	1999/05/24 02:04:24	1.11
  @@ -83,31 +83,31 @@
   
   /* Thread Function definitions */
   ap_threadattr_t *ap_create_threadattr(ap_context_t *);
  -ap_status_t ap_setthreadattr_detach(ap_context_t *, ap_threadattr_t *, ap_int32_t);
  -ap_status_t ap_getthreadattr_detach(ap_context_t *, ap_threadattr_t *);
  +ap_status_t ap_setthreadattr_detach(ap_threadattr_t *, ap_int32_t);
  +ap_status_t ap_getthreadattr_detach(ap_threadattr_t *);
   ap_thread_t *ap_create_thread(ap_context_t *, ap_threadattr_t *, ap_thread_start_t, void *);
   void ap_thread_exit(ap_context_t *, ap_status_t *);
  -ap_status_t ap_thread_join(ap_context_t *, ap_thread_t *thd, ap_status_t *); 
  -ap_status_t ap_thread_detach(ap_context_t *, ap_thread_t *);
  +ap_status_t ap_thread_join(ap_thread_t *thd, ap_status_t *); 
  +ap_status_t ap_thread_detach(ap_thread_t *);
   
  -ap_status_t ap_cancel_thread(ap_context_t *, ap_thread_t *);
  +ap_status_t ap_cancel_thread(ap_thread_t *);
   ap_status_t ap_setcanceltype(ap_context_t *, ap_int32_t);
   ap_status_t ap_setcancelstate(ap_context_t *, ap_int32_t);
   
   
   /* Process Function definitions */
   ap_procattr_t *ap_createprocattr_init(ap_context_t *);
  -ap_status_t ap_setprocattr_io(ap_context_t *, ap_procattr_t *, ap_int32_t, ap_int32_t, ap_int32_t);
  -ap_status_t ap_setprocattr_dir(ap_context_t *, ap_procattr_t *, char *);
  -ap_status_t ap_setprocattr_cmdtype(ap_context_t *, ap_procattr_t *, ap_cmdtype_e);
  +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 *);
  +ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *, ap_cmdtype_e);
   
  -ap_file_t *ap_get_childin(ap_context_t *, ap_proc_t *);
  -ap_file_t *ap_get_childout(ap_context_t *, ap_proc_t *);
  -ap_file_t *ap_get_childerr(ap_context_t *, ap_proc_t *);
  +ap_file_t *ap_get_childin(ap_proc_t *);
  +ap_file_t *ap_get_childout(ap_proc_t *);
  +ap_file_t *ap_get_childerr(ap_proc_t *);
   
  -ap_int32_t ap_fork(ap_context_t *, ap_proc_t *);
  +ap_int32_t ap_fork(ap_proc_t *);
   ap_proc_t *ap_create_process(ap_context_t *, char *, char *const [], char **, ap_procattr_t *);
  -ap_status_t ap_wait_proc(ap_context_t *, ap_proc_t *, ap_wait_how_e);
  +ap_status_t ap_wait_proc(ap_proc_t *, ap_wait_how_e);
   
   void ap_kill(ap_proc_t *, ap_int32_t);
   #ifdef __cplusplus
  
  
  
  1.2       +18 -18    apache-apr/include/apr_time.h
  
  Index: apr_time.h
  ===================================================================
  RCS file: /home/cvs/apache-apr/include/apr_time.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_time.h	1999/05/17 11:45:16	1.1
  +++ apr_time.h	1999/05/24 02:04:24	1.2
  @@ -69,28 +69,28 @@
   
   /* Function Definitions */
   ap_time_t *ap_make_time(ap_context_t *);
  -ap_status_t ap_current_time(ap_context_t *, ap_time_t *new);
  -ap_status_t ap_explode_time(ap_context_t *, ap_time_t *, ap_timetype_e);
  -ap_status_t ap_implode_time(ap_context_t *, ap_time_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 *);
   
   /* accessor functions */
  -ap_int64_t ap_get_curtime(ap_context_t *, ap_time_t *);
  +ap_int64_t ap_get_curtime(ap_time_t *);
   
  -ap_int32_t ap_get_sec(ap_context_t *, ap_time_t *);
  -ap_int32_t ap_get_min(ap_context_t *, ap_time_t *);
  -ap_int32_t ap_get_hour(ap_context_t *, ap_time_t *);
  -ap_int32_t ap_get_mday(ap_context_t *, ap_time_t *);
  -ap_int32_t ap_get_mon(ap_context_t *, ap_time_t *);
  -ap_int32_t ap_get_year(ap_context_t *, ap_time_t *);
  -ap_int32_t ap_get_wday(ap_context_t *, ap_time_t *);
  +ap_int32_t ap_get_sec(ap_time_t *);
  +ap_int32_t ap_get_min(ap_time_t *);
  +ap_int32_t ap_get_hour(ap_time_t *);
  +ap_int32_t ap_get_mday(ap_time_t *);
  +ap_int32_t ap_get_mon(ap_time_t *);
  +ap_int32_t ap_get_year(ap_time_t *);
  +ap_int32_t ap_get_wday(ap_time_t *);
   
  -void ap_set_sec(ap_context_t *, ap_time_t *, ap_int32_t);
  -void ap_set_min(ap_context_t *, ap_time_t *, ap_int32_t);
  -void ap_set_hour(ap_context_t *, ap_time_t *, ap_int32_t);
  -void ap_set_mday(ap_context_t *, ap_time_t *, ap_int32_t);
  -void ap_set_mon(ap_context_t *, ap_time_t *, ap_int32_t);
  -void ap_set_year(ap_context_t *, ap_time_t *, ap_int32_t);
  -void ap_set_wday(ap_context_t *, ap_time_t *, ap_int32_t);
  +void ap_set_sec(ap_time_t *, ap_int32_t);
  +void ap_set_min(ap_time_t *, ap_int32_t);
  +void ap_set_hour(ap_time_t *, ap_int32_t);
  +void ap_set_mday(ap_time_t *, ap_int32_t);
  +void ap_set_mon(ap_time_t *, ap_int32_t);
  +void ap_set_year(ap_time_t *, ap_int32_t);
  +void ap_set_wday(ap_time_t *, ap_int32_t);
   
   #ifdef __cplusplus
   }
  
  
  

Mime
View raw message