httpd-cvs mailing list archives

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

  Modified:    src/lib/apr/file_io/os2 dir.c fileacc.c open.c pipe.c
               src/lib/apr/file_io/unix dir.c fileacc.c open.c pipe.c
                        readwrite.c
               src/lib/apr/file_io/win32 dir.c fileacc.c open.c pipe.c
                        readwrite.c
               src/lib/apr/include apr_file_io.h apr_portable.h
               src/lib/apr/test ab_apr.c abc.c htdigest.c testfile.c
                        testproc.c
               src/main http_core.c http_log.c util.c
               src/modules/mpm/dexter acceptlock.c
               src/modules/mpm/mpmt_pthread acceptlock.c scoreboard.c
               src/modules/mpm/prefork prefork.c
               src/modules/standard mod_asis.c mod_autoindex.c
                        mod_negotiation.c
  Log:
  Bring file_io up to the new parameter order for APR.  I have decided to do
  these on a directory by directory basis for the rest of APR.  I hope to
  cause fewer problems for other developers by doing it this way.
  
  Revision  Changes    Path
  1.3       +6 -6      apache-2.0/src/lib/apr/file_io/os2/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/dir.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- dir.c	1999/10/04 16:36:47	1.2
  +++ dir.c	1999/10/06 23:03:42	1.3
  @@ -69,7 +69,7 @@
   
   
   
  -ap_status_t ap_opendir(struct dir_t **new, ap_context_t *cntxt, const char *dirname)
  +ap_status_t ap_opendir(struct dir_t **new, const char *dirname, ap_context_t *cntxt)
   {
       struct dir_t *thedir = (struct dir_t *)ap_palloc(cntxt, sizeof(struct dir_t));
       
  @@ -139,21 +139,21 @@
   
   
   
  -ap_status_t ap_make_dir(ap_context_t *cont, const char *path, ap_fileperms_t perm)
  +ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_context_t *cont)
   {
       return os2errno(DosCreateDir(path, NULL));
   }
   
   
   
  -ap_status_t ap_remove_dir(ap_context_t *cont, const char *path)
  +ap_status_t ap_remove_dir(const char *path, ap_context_t *cont)
   {
       return os2errno(DosDeleteDir(path));
   }
   
   
   
  -ap_status_t ap_dir_entry_size(struct dir_t *thedir, ap_ssize_t *size)
  +ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct dir_t *thedir)
   {
       if (thedir->validentry) {
           *size = thedir->entry.cbFile;
  @@ -165,7 +165,7 @@
   
   
   
  -ap_status_t ap_dir_entry_mtime(struct dir_t *thedir, time_t *time)
  +ap_status_t ap_dir_entry_mtime(time_t *time, struct dir_t *thedir)
   {
       if (thedir->validentry) {
           *time = os2date2unix(thedir->entry.fdateLastWrite, thedir->entry.ftimeLastWrite);
  @@ -177,7 +177,7 @@
   
   
   
  -ap_status_t ap_dir_entry_ftype(struct dir_t *thedir, ap_filetype_e *type)
  +ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct dir_t *thedir)
   {
       int rc;
       HFILE hFile;
  
  
  
  1.3       +5 -5      apache-2.0/src/lib/apr/file_io/os2/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileacc.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- fileacc.c	1999/10/04 16:36:47	1.2
  +++ fileacc.c	1999/10/06 23:03:42	1.3
  @@ -76,7 +76,7 @@
   
   
   
  -ap_status_t ap_get_filesize(struct file_t *file, ap_ssize_t *size)
  +ap_status_t ap_get_filesize(ap_ssize_t *size, struct file_t *file)
   {
       ap_status_t rv;
       
  @@ -98,7 +98,7 @@
   
   
   
  -ap_status_t ap_get_fileperms(struct file_t *file, ap_fileperms_t *perm)
  +ap_status_t ap_get_fileperms(ap_fileperms_t *perm, struct file_t *file)
   {
       ap_status_t rv;
     
  @@ -120,7 +120,7 @@
   
   
   
  -ap_status_t ap_get_fileatime(struct file_t *file, time_t *time)
  +ap_status_t ap_get_fileatime(time_t *time, struct file_t *file)
   {    
       ap_status_t rv;
   
  @@ -142,7 +142,7 @@
   
   
   
  -ap_status_t ap_get_filectime(struct file_t *file, time_t *time)
  +ap_status_t ap_get_filectime(time_t *time, struct file_t *file)
   {    
       ap_status_t rv;
   
  @@ -165,7 +165,7 @@
   
   
   
  -ap_status_t ap_get_filemtime(struct file_t *file, time_t *time)
  +ap_status_t ap_get_filemtime(time_t *time, struct file_t *file)
   {    
       ap_status_t rv;
   
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/file_io/os2/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/open.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- open.c	1999/10/04 16:36:47	1.2
  +++ open.c	1999/10/06 23:03:44	1.3
  @@ -153,7 +153,7 @@
   
   
   
  -ap_status_t ap_remove_file(ap_context_t *cntxt, char *path)
  +ap_status_t ap_remove_file(char *path, ap_context_t *cntxt)
   {
       ULONG rc = DosDelete(path);
       return os2errno(rc);
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/file_io/os2/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/pipe.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pipe.c	1999/10/04 16:36:47	1.2
  +++ pipe.c	1999/10/06 23:03:44	1.3
  @@ -89,7 +89,7 @@
   
   
   
  -ap_status_t ap_create_namedpipe(char **new, ap_context_t *cont, char *dirpath, ap_fileperms_t perm)
  +ap_status_t ap_create_namedpipe(char **new, char *dirpath, ap_fileperms_t perm, ap_context_t *cont)
   {
       /* Not yet implemented, interface not suitable */
       return -1;
  
  
  
  1.7       +14 -14    apache-2.0/src/lib/apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- dir.c	1999/10/05 14:24:28	1.6
  +++ dir.c	1999/10/06 23:03:46	1.7
  @@ -75,13 +75,13 @@
   } 
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_opendir(ap_dir_t **, ap_context_t *, char *)
  + * ap_status_t ap_opendir(ap_dir_t **, char *, ap_context_t *)
    *    Open the specified directory. 
    * arg 1) The context to use.
    * arg 2) The full path to the directory (use / on all systems)
    * arg 3) The opened directory descriptor.
    */                        
  -ap_status_t ap_opendir(struct dir_t **new, ap_context_t *cont, const char *dirname)
  +ap_status_t ap_opendir(struct dir_t **new, const char *dirname, ap_context_t *cont)
   {
       (*new) = (struct dir_t *)ap_palloc(cont, sizeof(struct dir_t));
   
  @@ -142,13 +142,13 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_make_dir(ap_context_t *, const char *, ap_fileperms_t)
  + * ap_status_t ap_make_dir(const char *, ap_fileperms_t, ap_context_t *)
    *    Create a new directory on the file system. 
    * arg 1) the context to use.
    * arg 2) the path for the directory to be created.  (use / on all systems)
    * arg 3) Permissions for the new direcoty.
    */                        
  -ap_status_t ap_make_dir(ap_context_t *cont, const char *path, ap_fileperms_t perm)
  +ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_context_t *cont)
   {
       mode_t mode = get_fileperms(perm);
       if (mkdir(path, mode) == 0) {
  @@ -160,12 +160,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_remove_dir(ap_context_t *, const char *)
  + * ap_status_t ap_remove_dir(const char *, ap_context_t *)
    *    Remove directory from the file system. 
    * arg 1) the context to use.
    * arg 2) the path for the directory to be removed.  (use / on all systems)
    */                        
  -ap_status_t ap_remove_dir(ap_context_t *cont, const char *path)
  +ap_status_t ap_remove_dir(const char *path, ap_context_t *cont)
   {
       if (rmdir(path) == 0) {
           return APR_SUCCESS;
  @@ -176,12 +176,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_dir_entry_size(ap_dir_t *, ap_ssize_t *)
  + * ap_status_t ap_dir_entry_size(ap_ssize_t *, ap_dir_t *)
    *    Get the size of the current directory entry. 
    * arg 1) the currently open directory.
    * arg 2) the size of the directory entry. 
    */                        
  -ap_status_t ap_dir_entry_size(struct dir_t *thedir, ap_ssize_t *size)
  +ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;    
  @@ -202,12 +202,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_dir_entry_mtime(ap_dir_t *, time_t *)
  + * ap_status_t ap_dir_entry_mtime(time_t *, ap_dir_t *)
    *    Get the last modified time of the current directory entry. 
    * arg 1) the currently open directory.
    * arg 2) the last modified time of the directory entry. 
    */                        
  -ap_status_t ap_dir_entry_mtime(struct dir_t *thedir, time_t *mtime)
  +ap_status_t ap_dir_entry_mtime(time_t *mtime, struct dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;
  @@ -229,12 +229,12 @@
   }
    
   /* ***APRDOC********************************************************
  - * ap_status_t ap_dir_entry_ftype(ap_dir_t *, ap_filetype_e *)
  + * ap_status_t ap_dir_entry_ftype(ap_filetype_e *, ap_dir_t *)
    *    Get the file type of the current directory entry. 
    * arg 1) the currently open directory.
    * arg 2) the file type of the directory entry. 
    */                        
  -ap_status_t ap_dir_entry_ftype(struct dir_t *thedir, ap_filetype_e *type)
  +ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;
  @@ -283,12 +283,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_os_dir(ap_dir_t *, ap_os_dir_t *)
  + * ap_status_t ap_get_os_dir(ap_os_dir_t *, ap_dir_t *)
    *    convert the dir from apr type to os specific type.
    * arg 1) The apr dir to convert.
    * arg 2) The os specific dir we are converting to
    */   
  -ap_status_t ap_get_os_dir(struct dir_t *dir, ap_os_dir_t *thedir)
  +ap_status_t ap_get_os_dir(ap_os_dir_t *thedir, struct dir_t *dir)
   {
       if (dir == NULL) {
           return APR_ENODIR;
  
  
  
  1.8       +14 -14    apache-2.0/src/lib/apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- fileacc.c	1999/10/04 16:36:50	1.7
  +++ fileacc.c	1999/10/06 23:03:46	1.8
  @@ -110,12 +110,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_filesize(ap_file_t *, ap_ssize_t *)
  + * ap_status_t ap_get_filesize(ap_ssize_t *, ap_file_t *)
    *    Return the size of the current file.
    * arg 1) The currently open file.
    * arg 2) The size of the file.  
    */                     
  -ap_status_t ap_get_filesize(struct file_t *file, ap_ssize_t *size)
  +ap_status_t ap_get_filesize(ap_ssize_t *size, struct file_t *file)
   {
       if (file != NULL) {
           if (!file->stated) {
  @@ -131,12 +131,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_fileperms(ap_file_t *, ap_fileperms_t *)
  + * ap_status_t ap_get_fileperms(ap_fileperms_t *, ap_file_t *)
    *    Return the permissions of the current file.
    * arg 1) The currently open file.
    * arg 2) The permissions of the file.  
    */                     
  -ap_status_t ap_get_fileperms(struct file_t *file, ap_fileperms_t *perm)
  +ap_status_t ap_get_fileperms(ap_fileperms_t *perm, struct file_t *file)
   {
       if (file != NULL) {
           if (!file->stated) {
  @@ -152,12 +152,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_fileatime(ap_file_t *, time_t *)
  + * ap_status_t ap_get_fileatime(time_t *, ap_file_t *)
    *    Return the last access time of the current file.
    * arg 1) The currently open file.
    * arg 2) The last access time of the file.  
    */                     
  -ap_status_t ap_get_fileatime(struct file_t *file, time_t *atime)
  +ap_status_t ap_get_fileatime(time_t *atime, struct file_t *file)
   {    
       if (file != NULL) {
           if (!file->stated) {
  @@ -173,12 +173,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_filectime(ap_file_t *, time_t *)
  + * ap_status_t ap_get_filectime(time_t *, ap_file_t *)
    *    Return the time of the last change to the current file.
    * arg 1) The currently open file.
    * arg 2) The last change time of the file.  
    */                     
  -ap_status_t ap_get_filectime(struct file_t *file, time_t *ptime)
  +ap_status_t ap_get_filectime(time_t *ptime, struct file_t *file)
   {    
       if (file != NULL) {
           if (!file->stated) {
  @@ -194,12 +194,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_filemtime(ap_file_t *, time_t *)
  + * ap_status_t ap_get_filemtime(time_t *, ap_file_t *)
    *    Return the last modified time of the current file.
    * arg 1) The currently open file.
    * arg 2) The last modified time of the file.  
    */                     
  -ap_status_t ap_get_filemtime(struct file_t *file, time_t *mtime)
  +ap_status_t ap_get_filemtime(time_t *mtime, struct file_t *file)
   {    
       if (file != NULL) {
           if (!file->stated) {
  @@ -215,12 +215,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_filetype(ap_file_t *, ap_filetype_e)
  + * ap_status_t ap_get_filetype(ap_filetype_e, ap_file_t *)
    *    Return the type of the current file.
    * arg 1) The currently open file.
    * arg 2) The file type
    */                     
  -ap_status_t ap_get_filetype(struct file_t *file, ap_filetype_e *type)
  +ap_status_t ap_get_filetype(ap_filetype_e *type, struct file_t *file)
   {    
       if (file != NULL) {
           if (!file->stated) {
  @@ -251,13 +251,13 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_filedata(ap_file_t *, char *key, void *)
  + * ap_status_t ap_get_filedata(void *, char *key, ap_file_t *)
    *    Return the data associated with the current file.
    * arg 1) The currently open file.
    * arg 2) The key to use for retreiving data associated with this file.
    * arg 3) The user data associated with the file.  
    */                     
  -ap_status_t ap_get_filedata(struct file_t *file, char *key, void *data)
  +ap_status_t ap_get_filedata(void *data, char *key, struct file_t *file)
   {    
       if (file != NULL) {
           return ap_get_userdata(&data, file->cntxt, key);
  
  
  
  1.13      +2 -2      apache-2.0/src/lib/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- open.c	1999/10/04 16:36:50	1.12
  +++ open.c	1999/10/06 23:03:46	1.13
  @@ -204,7 +204,7 @@
    * NOTE: If the file is open, it won't be removed until all instances are
    *       closed.
    */
  -ap_status_t ap_remove_file(ap_context_t *cont, char *path)
  +ap_status_t ap_remove_file(char *path, ap_context_t *cont)
   {
       if (unlink(path) == 0) {
           return APR_SUCCESS;
  @@ -222,7 +222,7 @@
    * NOTE:  On Unix, it is only possible to get a file descriptor from 
    *        an apr file type.
    */
  -ap_status_t ap_get_os_file(struct file_t *file, ap_os_file_t *thefile)
  +ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct file_t *file)
   {
       if (file == NULL) {
           return APR_ENOFILE;
  
  
  
  1.3       +2 -2      apache-2.0/src/lib/apr/file_io/unix/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/pipe.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pipe.c	1999/10/04 16:36:50	1.2
  +++ pipe.c	1999/10/06 23:03:47	1.3
  @@ -100,8 +100,8 @@
    * arg 3) The permissions for the newly created pipe.
    * arg 4) The name of the new pipe. 
    */
  -ap_status_t ap_create_namedpipe(char **new, ap_context_t *cont, char *dirpath, 
  -                                ap_fileperms_t perm)
  +ap_status_t ap_create_namedpipe(char **new, char *dirpath, 
  +                                ap_fileperms_t perm, ap_context_t *cont)
   {
       mode_t mode = get_fileperms(perm);
   
  
  
  
  1.10      +10 -10    apache-2.0/src/lib/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- readwrite.c	1999/10/04 17:24:28	1.9
  +++ readwrite.c	1999/10/06 23:03:47	1.10
  @@ -165,12 +165,12 @@
   #endif
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_putc(ap_file_t *, char)
  + * ap_status_t ap_putc(char, ap_file_t *)
    *    put a character into the specified file.
    * arg 1) The file descriptor to write to
    * arg 2) The character to write.
    */
  -ap_status_t ap_putc(ap_file_t *thefile, char ch)
  +ap_status_t ap_putc(char ch, ap_file_t *thefile)
   {
       if (thefile->buffered) {
           if (fputc(ch, thefile->filehand) == ch) {
  @@ -187,12 +187,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_ungetc(ap_file_t *, char)
  + * ap_status_t ap_ungetc(char, ap_file_t *)
    *    put a character back onto a specified stream.
    * arg 1) The file descriptor to write to
    * arg 2) The character to write.
    */
  -ap_status_t ap_ungetc(ap_file_t *thefile, char ch)
  +ap_status_t ap_ungetc(char ch, ap_file_t *thefile)
   {
       if (thefile->buffered) {
           if (ungetc(ch, thefile->filehand) == ch) {
  @@ -207,12 +207,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_getc(ap_file_t *, char *)
  + * ap_status_t ap_getc(char *, ap_file_t *)
    *    get a character from the specified file.
    * arg 1) The file descriptor to write to
    * arg 2) The character to write.
    */
  -ap_status_t ap_getc(ap_file_t *thefile, char *ch)
  +ap_status_t ap_getc(char *ch, ap_file_t *thefile)
   {
       ssize_t rv;
       
  @@ -242,12 +242,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_puts(ap_file_t *, char *)
  + * ap_status_t ap_puts(char *, ap_file_t *)
    *    Put the string into a specified file.
    * arg 1) The file descriptor to write to from
    * arg 2) The string to write. 
    */
  -ap_status_t ap_puts(ap_file_t *thefile, char *str)
  +ap_status_t ap_puts(char *str, ap_file_t *thefile)
   {
       ssize_t rv;
       int len;
  @@ -289,13 +289,13 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_fgets(ap_file_t *, char *, int)
  + * ap_status_t ap_fgets(char *, int, ap_file_t *)
    *    Get a string from a specified file.
    * arg 1) The file descriptor to read from
    * arg 2) The buffer to store the string in. 
    * arg 3) The length of the string
    */
  -ap_status_t ap_fgets(ap_file_t *thefile, char *str, int len)
  +ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
   {
       ssize_t rv;
       int i;    
  
  
  
  1.4       +8 -8      apache-2.0/src/lib/apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dir.c	1999/10/05 01:11:49	1.3
  +++ dir.c	1999/10/06 23:03:53	1.4
  @@ -84,7 +84,7 @@
       }
   } 
   
  -ap_status_t ap_opendir(struct dir_t **new, ap_context_t *cont, const char *dirname)
  +ap_status_t ap_opendir(struct dir_t **new, const char *dirname, ap_context_t *cont)
   {
   	char * temp;
   	(*new) = ap_palloc(cont, sizeof(struct dir_t));
  @@ -137,7 +137,7 @@
   		return APR_SUCCESS;
   	}
       if ((stat = ap_closedir(thedir)) == APR_SUCCESS) {
  -		if ((stat = ap_opendir(&thedir, cont, temp)) == APR_SUCCESS) {
  +		if ((stat = ap_opendir(&thedir, temp, cont)) == APR_SUCCESS) {
   			ap_readdir(thedir);
   			return APR_SUCCESS;
   		}
  @@ -145,7 +145,7 @@
   	return stat;	
   }
   
  -ap_status_t ap_make_dir(ap_context_t *cont, const char *path, ap_fileperms_t perm)
  +ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_context_t *cont)
   {
       if (CreateDirectory(path, NULL)) {
   		return APR_SUCCESS;
  @@ -153,7 +153,7 @@
       return APR_EEXIST;
   }
   
  -ap_status_t ap_remove_dir(ap_context_t *cont, const char *path)
  +ap_status_t ap_remove_dir(const char *path, ap_context_t *cont)
   {
   DWORD huh;
       char *temp = canonical_filename(cont, path);
  @@ -164,7 +164,7 @@
   	return APR_EEXIST;
   }
   
  -ap_status_t ap_dir_entry_size(struct dir_t *thedir, ap_ssize_t *size)
  +ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct dir_t *thedir)
   {
       if (thedir == NULL || thedir->entry == NULL) {
   		return APR_ENODIR;
  @@ -174,7 +174,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dir_entry_mtime(struct dir_t *thedir, time_t *time)
  +ap_status_t ap_dir_entry_mtime(time_t *time, struct dir_t *thedir)
   {
       if (thedir == NULL || thedir->entry == NULL) {
   		return APR_ENODIR;
  @@ -185,7 +185,7 @@
       return APR_SUCCESS;
   }
    
  -ap_status_t ap_dir_entry_ftype(struct dir_t *thedir, ap_filetype_e *type)
  +ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct dir_t *thedir)
   {
   	switch(thedir->entry->dwFileAttributes) {
   	case FILE_ATTRIBUTE_DIRECTORY: {
  @@ -209,7 +209,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_dir(struct dir_t *dir, ap_os_dir_t *thedir)
  +ap_status_t ap_get_os_dir(ap_os_dir_t *thedir, struct dir_t *dir)
   {
       if (dir == NULL) {
           return APR_ENODIR;
  
  
  
  1.6       +7 -7      apache-2.0/src/lib/apr/file_io/win32/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileacc.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- fileacc.c	1999/10/05 01:11:49	1.5
  +++ fileacc.c	1999/10/06 23:03:53	1.6
  @@ -103,7 +103,7 @@
       return rv;
   }*/
   
  -ap_status_t ap_get_filesize(struct file_t *file, ap_ssize_t *size)
  +ap_status_t ap_get_filesize(ap_ssize_t *size, struct file_t *file)
   {
       if (file != NULL) {
           *size = file->size;
  @@ -115,7 +115,7 @@
       }
   }
   /*
  -ap_status_t ap_get_fileperms(struct file_t *file, ap_fileperms_t *perm)
  +ap_status_t ap_get_fileperms(ap_fileperms_t *perm, struct file_t *file)
   {
       if (file != NULL) {
           *perm = file->protection;
  @@ -127,7 +127,7 @@
       }
   }
   */
  -ap_status_t ap_get_fileatime(struct file_t *file, time_t *time)
  +ap_status_t ap_get_fileatime(time_t *time, struct file_t *file)
   {    
       if (file != NULL) {
           *time = file->atime;
  @@ -139,7 +139,7 @@
       }
   }
   
  -ap_status_t ap_get_filectime(struct file_t *file, time_t *time)
  +ap_status_t ap_get_filectime(time_t *time, struct file_t *file)
   {    
       if (file != NULL) {
           *time = file->ctime;
  @@ -151,7 +151,7 @@
       }
   }
   
  -ap_status_t ap_get_filemtime(struct file_t *file, time_t *time)
  +ap_status_t ap_get_filemtime(time_t *time, struct file_t *file)
   {    
       if (file != NULL) {
           *time = file->mtime;
  @@ -162,7 +162,7 @@
           return APR_ENOFILE;
       }
   }
  -ap_status_t ap_get_filetype(struct file_t *file, ap_filetype_e *type)
  +ap_status_t ap_get_filetype(ap_filetype_e *type, struct file_t *file)
   {    
       if (file != NULL) {
           if (!file->stated) {
  @@ -180,7 +180,7 @@
           return APR_ENOFILE;
       }
   }
  -ap_status_t ap_get_filedata(struct file_t *file, char *key, void *data)
  +ap_status_t ap_get_filedata(void *data, char *key, struct file_t *file)
   {    
       if (file != NULL) {
           return ap_get_userdata(&data, file->cntxt, key);
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/open.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- open.c	1999/10/05 01:11:48	1.3
  +++ open.c	1999/10/06 23:03:54	1.4
  @@ -151,7 +151,7 @@
       return stat;
   }
   
  -ap_status_t ap_remove_file(ap_context_t *cont, char *path)
  +ap_status_t ap_remove_file(char *path, ap_context_t *cont)
   {
       char *temp = canonical_filename(cont, path);
   
  @@ -163,7 +163,7 @@
       }
   }
   
  -ap_status_t ap_get_os_file(struct file_t *file, ap_os_file_t *thefile)
  +ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct file_t *file)
   {
       if (file == NULL) {
           return APR_ENOFILE;
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/file_io/win32/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/pipe.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pipe.c	1999/10/04 16:36:53	1.2
  +++ pipe.c	1999/10/06 23:03:54	1.3
  @@ -87,7 +87,7 @@
   }
   
   /*
  -ap_status_t ap_create_namedpipe(char **new, ap_context_t *cont, char *dirpath, ap_fileperms_t perm)
  +ap_status_t ap_create_namedpipe(char **new, char *dirpath, ap_fileperms_t perm, ap_context_t *cont)
   {
       mode_t mode = get_fileperms(perm);
   
  
  
  
  1.5       +5 -5      apache-2.0/src/lib/apr/file_io/win32/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/readwrite.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- readwrite.c	1999/10/04 17:24:31	1.4
  +++ readwrite.c	1999/10/06 23:03:55	1.5
  @@ -126,7 +126,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_putc(ap_file_t *thefile, char ch)
  +ap_status_t ap_putc(char ch, ap_file_t *thefile)
   {
       DWORD bwrote;
   
  @@ -136,7 +136,7 @@
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_ungetc(ap_file_t *thefile, char ch)
  +ap_status_t ap_ungetc(char ch, ap_file_t *thefile)
   {
       /* 
        * Your application must provide its own serialization (locking) if
  @@ -172,7 +172,7 @@
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_getc(ap_file_t *thefile, char *ch)
  +ap_status_t ap_getc(char *ch, ap_file_t *thefile)
   {
       DWORD bread;
       if (!ReadFile(thefile->filehand, ch, 1, &bread, NULL)) {
  @@ -185,7 +185,7 @@
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_puts(ap_file_t *thefile, char *str)
  +ap_status_t ap_puts(char *str, ap_file_t *thefile)
   {
       DWORD bwrote;
       int len;
  @@ -201,7 +201,7 @@
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_fgets(ap_file_t *thefile, char *str, int len)
  +ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
   {
       DWORD bread;
       int i;
  
  
  
  1.8       +21 -21    apache-2.0/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_file_io.h	1999/10/04 17:24:35	1.7
  +++ apr_file_io.h	1999/10/06 23:03:59	1.8
  @@ -109,17 +109,17 @@
   /*   Function definitions */
   ap_status_t ap_open(ap_file_t **, ap_context_t *, const char *, ap_int32_t, ap_fileperms_t);
   ap_status_t ap_close(ap_file_t *);
  -ap_status_t ap_remove_file(ap_context_t *, char *);
  +ap_status_t ap_remove_file(char *, ap_context_t *);
   ap_status_t ap_eof(ap_file_t *);
   
   ap_status_t ap_read(ap_file_t *, void *, ap_ssize_t *);
   ap_status_t ap_write(ap_file_t *, void *, ap_ssize_t *);
   ap_status_t ap_writev(ap_file_t *, const ap_iovec_t *, ap_ssize_t *);
  -ap_status_t ap_putc(ap_file_t *, char);
  -ap_status_t ap_getc(ap_file_t *, char *);
  -ap_status_t ap_ungetc(ap_file_t *, char);
  -ap_status_t ap_fgets(ap_file_t *, char *, int);
  -ap_status_t ap_puts(ap_file_t *, char *);
  +ap_status_t ap_putc(char, ap_file_t *);
  +ap_status_t ap_getc(char *, ap_file_t *);
  +ap_status_t ap_ungetc(char, ap_file_t *);
  +ap_status_t ap_fgets(char *, int, ap_file_t *);
  +ap_status_t ap_puts(char *, ap_file_t *);
   ap_status_t ap_flush(ap_file_t *);
   API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...)
           __attribute__((format(printf,2,3)));
  @@ -128,33 +128,33 @@
   ap_status_t ap_getfileinfo(ap_file_t *);
   ap_status_t ap_seek(ap_file_t *, ap_seek_where_t, ap_off_t *);
   
  -ap_status_t ap_opendir(ap_dir_t **, ap_context_t *, const char *);
  +ap_status_t ap_opendir(ap_dir_t **, const char *, ap_context_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 *);
  +ap_status_t ap_make_dir(const char *, ap_fileperms_t, ap_context_t *);
  +ap_status_t ap_remove_dir(const char *, ap_context_t *);
   
   ap_status_t ap_create_pipe(ap_file_t **, ap_file_t **, ap_context_t *);
  -ap_status_t ap_create_namedpipe(char **, ap_context_t *, char *, ap_fileperms_t);
  +ap_status_t ap_create_namedpipe(char **, char *, ap_fileperms_t, ap_context_t *);
   
   /*accessor and general file_io functions. */
   ap_status_t ap_get_filename(char **, ap_file_t *);
   ap_status_t ap_get_dir_filename(char **, ap_dir_t *);
  -ap_status_t ap_get_filedata(ap_file_t *, char *, void *);
  +ap_status_t ap_get_filedata(void *, char *, ap_file_t *);
   ap_status_t ap_set_filedata(ap_file_t *, void *, char *,
                               ap_status_t (*cleanup) (void *));
   
  -ap_status_t ap_dir_entry_size(ap_dir_t *, ap_ssize_t *);
  -ap_status_t ap_dir_entry_mtime(ap_dir_t *, time_t *);
  -ap_status_t ap_dir_entry_ftype(ap_dir_t *, ap_filetype_e *);
  -
  -ap_status_t ap_get_filesize(ap_file_t *, ap_ssize_t *);
  -ap_status_t ap_get_filetype(ap_file_t *, ap_filetype_e *);
  -ap_status_t ap_get_fileperms(ap_file_t *, ap_fileperms_t *);
  -ap_status_t ap_get_fileatime(ap_file_t *,time_t *);
  -ap_status_t ap_get_filectime(ap_file_t *,time_t *);
  -ap_status_t ap_get_filemtime(ap_file_t *,time_t *);
  +ap_status_t ap_dir_entry_size(ap_ssize_t *, ap_dir_t *);
  +ap_status_t ap_dir_entry_mtime(time_t *, ap_dir_t *);
  +ap_status_t ap_dir_entry_ftype(ap_filetype_e *, ap_dir_t *);
  +
  +ap_status_t ap_get_filesize(ap_ssize_t *, ap_file_t *);
  +ap_status_t ap_get_filetype(ap_filetype_e *, ap_file_t *);
  +ap_status_t ap_get_fileperms(ap_fileperms_t *, ap_file_t *);
  +ap_status_t ap_get_fileatime(time_t *, ap_file_t *);
  +ap_status_t ap_get_filectime(time_t *, ap_file_t *);
  +ap_status_t ap_get_filemtime(time_t *, ap_file_t *);
   
   #ifdef __cplusplus
   }
  
  
  
  1.6       +2 -2      apache-2.0/src/lib/apr/include/apr_portable.h
  
  Index: apr_portable.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_portable.h	1999/10/04 16:36:54	1.5
  +++ apr_portable.h	1999/10/06 23:04:01	1.6
  @@ -180,8 +180,8 @@
   typedef struct timeval        ap_os_time_t;
   #endif
   
  -ap_status_t ap_get_os_file(ap_file_t *, ap_os_file_t *);     
  -ap_status_t ap_get_os_dir(ap_dir_t *, ap_os_dir_t *);      
  +ap_status_t ap_get_os_file(ap_os_file_t *, ap_file_t *);     
  +ap_status_t ap_get_os_dir(ap_os_dir_t *, ap_dir_t *);      
   ap_status_t ap_get_os_sock(ap_socket_t *, ap_os_sock_t *);
   ap_status_t ap_get_os_lock(ap_lock_t *, ap_os_lock_t *);     
   ap_status_t ap_get_os_thread(ap_thread_t *, ap_os_thread_t *);
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/test/ab_apr.c
  
  Index: ab_apr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/ab_apr.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ab_apr.c	1999/10/04 16:37:22	1.5
  +++ ab_apr.c	1999/10/06 23:04:06	1.6
  @@ -866,7 +866,7 @@
   
       /* No need to perform stat here, the ap_open will do it for us.  */  
   
  -    ap_get_filesize(postfd, &postlen);
  +    ap_get_filesize(&postlen, postfd);
       postdata = (char *)malloc(postlen);
       if (!postdata) {
           printf("Can\'t alloc postfile buffer\n");
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/test/abc.c
  
  Index: abc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/abc.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- abc.c	1999/10/04 16:37:23	1.3
  +++ abc.c	1999/10/06 23:04:06	1.4
  @@ -16,7 +16,7 @@
       ap_open(&fd, context, argv[1], APR_READ, -1);
       
       while (!status) {
  -        status = ap_getc(fd, &ch);
  +        status = ap_getc(&ch, fd);
           if (status == APR_EOF )
               fprintf(stdout, "EOF, YEAH!!!!!!!!!\n");
           else if (status == APR_SUCCESS)
  
  
  
  1.6       +7 -7      apache-2.0/src/lib/apr/test/htdigest.c
  
  Index: htdigest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htdigest.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- htdigest.c	1999/10/04 16:37:23	1.5
  +++ htdigest.c	1999/10/06 23:04:06	1.6
  @@ -113,11 +113,11 @@
       char ch;
   
       while (1) {
  -	ap_getc(f, &ch);
  +	ap_getc(&ch, f);
               s[i] = ch;
   
   	if (s[i] == CR)
  -	    ap_getc(f, &ch);
  +	    ap_getc(&ch, f);
               s[i] = ch;
   
   	if ((s[i] == 0x4) || (s[i] == LF) || (i == (n - 1))) {
  @@ -136,8 +136,8 @@
       int x;
   
       for (x = 0; l[x]; x++)
  -	ap_putc(f, l[x]);
  -    ap_putc(f, '\n');
  +	ap_putc(l[x], f);
  +    ap_putc('\n', f);
   }
   
   
  @@ -161,7 +161,7 @@
       if (strcmp(pwin, pwv) != 0) {
   	fprintf(stderr, "They don't match, sorry.\n");
   	if (tn) {
  -	    ap_remove_file(cntxt, tn);
  +	    ap_remove_file(tn, cntxt);
   	}
   	exit(1);
       }
  @@ -192,7 +192,7 @@
   {
       fprintf(stderr, "Interrupted.\n");
       if (tn)
  -	ap_remove_file(cntxt, tn);
  +	ap_remove_file(tn, cntxt);
       exit(1);
   }
   
  @@ -275,6 +275,6 @@
       sprintf(command, "cp %s %s", tn, argv[1]);
   #endif
       system(command);
  -    ap_remove_file(cntxt, tn);
  +    ap_remove_file(tn, cntxt);
       return 0;
   }
  
  
  
  1.5       +8 -8      apache-2.0/src/lib/apr/test/testfile.c
  
  Index: testfile.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testfile.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testfile.c	1999/10/04 16:37:24	1.4
  +++ testfile.c	1999/10/06 23:04:07	1.5
  @@ -162,7 +162,7 @@
       }
       
       fprintf(stdout, "\tDeleting file.......");
  -    status = ap_remove_file(context, filename);
  +    status = ap_remove_file(filename, context);
       if (status  != APR_SUCCESS) {
           fprintf(stderr, "Couldn't delete the file\n");
           exit(-1); 
  @@ -202,7 +202,7 @@
           return stat;
       }
   
  -    if ((stat = ap_remove_file(context, "testdel"))  != APR_SUCCESS) {
  +    if ((stat = ap_remove_file("testdel", context))  != APR_SUCCESS) {
           return stat;
       }
   
  @@ -225,7 +225,7 @@
       fprintf(stdout, "Testing Directory functions.\n");
   
       fprintf(stdout, "\tMakeing Directory.......");
  -    if (ap_make_dir(context, "testdir", APR_UREAD | APR_UWRITE | APR_UEXECUTE | APR_GREAD | APR_GWRITE | APR_GEXECUTE | APR_WREAD | APR_WWRITE | APR_WEXECUTE)  != APR_SUCCESS) {
  +    if (ap_make_dir("testdir", APR_UREAD | APR_UWRITE | APR_UEXECUTE | APR_GREAD | APR_GWRITE | APR_GEXECUTE | APR_WREAD | APR_WWRITE | APR_WEXECUTE, context)  != APR_SUCCESS) {
           fprintf(stderr, "Could not create directory\n");
           return -1;
       }
  @@ -242,7 +242,7 @@
   	ap_close(file);
   
       fprintf(stdout, "\tOpening Directory.......");
  -    if (ap_opendir(&temp, context, "testdir") != APR_SUCCESS) {
  +    if (ap_opendir(&temp, "testdir", context) != APR_SUCCESS) {
           fprintf(stderr, "Could not open directory\n");
           return -1;
       }
  @@ -278,7 +278,7 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\t\tFile type.......");
  -    ap_dir_entry_ftype(temp, &type);
  +    ap_dir_entry_ftype(&type, temp);
       if (type != APR_REG) {
           fprintf(stderr, "Got wrong file type\n");
           return -1;
  @@ -286,7 +286,7 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\t\tFile size.......");
  -    ap_dir_entry_size(temp, &bytes);
  +    ap_dir_entry_size(&bytes, temp);
       if (bytes != (ap_ssize_t)strlen("Another test!!!")) {
           fprintf(stderr, "Got wrong file size %d\n", bytes);
           return -1;
  @@ -307,7 +307,7 @@
       }
   
       fprintf(stdout, "\tRemoving file from directory.......");
  -    if (ap_remove_file(context, "testdir/testfile")  != APR_SUCCESS) {
  +    if (ap_remove_file("testdir/testfile", context)  != APR_SUCCESS) {
           fprintf(stderr, "Could not remove file\n");
           return -1;
       }
  @@ -316,7 +316,7 @@
       }
   
       fprintf(stdout, "\tRemoving Directory.......");
  -    if (ap_remove_dir(context, "testdir")  != APR_SUCCESS) {
  +    if (ap_remove_dir("testdir", context)  != APR_SUCCESS) {
           fprintf(stderr, "Could not remove directory\n");
           return -1;
       }
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/test/testproc.c
  
  Index: testproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testproc.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- testproc.c	1999/10/04 16:37:24	1.3
  +++ testproc.c	1999/10/06 23:04:07	1.4
  @@ -89,7 +89,7 @@
       }
   
       fprintf(stdout, "Creating directory for later use.......");
  -    if (ap_make_dir(context, "proctest", APR_UREAD | APR_UWRITE | APR_UEXECUTE) != APR_SUCCESS) {
  +    if (ap_make_dir("proctest", APR_UREAD | APR_UWRITE | APR_UEXECUTE, context) != APR_SUCCESS) {
           fprintf(stderr, "Could not create dir\n");
           exit(-1);
       }
  @@ -152,7 +152,7 @@
       else fprintf(stderr, "Read failed.\n");
   
       fprintf(stdout, "Removing directory.......");
  -    if (ap_remove_dir(context, "proctest") != APR_SUCCESS) {
  +    if (ap_remove_dir("proctest", context) != APR_SUCCESS) {
           fprintf(stderr, "Could not remove directory.\n");
           exit(-1);
       }
  
  
  
  1.16      +1 -1      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- http_core.c	1999/10/05 05:14:42	1.15
  +++ http_core.c	1999/10/06 23:04:08	1.16
  @@ -2521,7 +2521,7 @@
           return FORBIDDEN;
       }
       else
  -       ap_get_os_file (fd, &fd_os);
  +       ap_get_os_file(&fd_os, fd);
   	
       ap_update_mtime(r, r->finfo.st_mtime);
       ap_set_last_modified(r);
  
  
  
  1.8       +4 -4      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- http_log.c	1999/10/04 16:37:52	1.7
  +++ http_log.c	1999/10/06 23:04:08	1.8
  @@ -258,7 +258,7 @@
       if (s_main->error_log) {
   	/* replace stderr with this new log */
   	fflush(stderr);
  -        ap_get_os_file(s_main->error_log, &errfile);
  +        ap_get_os_file(&errfile, s_main->error_log);
   	if (dup2(errfile, STDERR_FILENO) == -1) {
   	    ap_log_error(APLOG_MARK, APLOG_CRIT, s_main,
   		"unable to replace stderr with error_log");
  @@ -295,7 +295,7 @@
   API_EXPORT(void) ap_error_log2stderr(server_rec *s) {
       int errfile;
   
  -    ap_get_os_file(s->error_log, &errfile);
  +    ap_get_os_file(&errfile, s->error_log);
       if (   s->error_log != NULL
           && errfile != STDERR_FILENO)
           dup2(errfile, STDERR_FILENO);
  @@ -458,8 +458,8 @@
       if (logf) {
         /* ZZZ let's just use AP funcs to Write to the error log.  If failure,
   	 can we output a message to the console??? */
  -	ap_puts(logf, errstr);
  -	ap_putc(logf, '\n');
  +	ap_puts(errstr, logf);
  +	ap_putc('\n', logf);
   	ap_flush(logf);
       }
   #ifdef HAVE_SYSLOG
  
  
  
  1.13      +3 -3      apache-2.0/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- util.c	1999/10/06 21:26:53	1.12
  +++ util.c	1999/10/06 23:04:08	1.13
  @@ -841,7 +841,7 @@
   {
       char ch;
       ap_file_t *cfp = (ap_file_t *) param;
  -    if (ap_getc(cfp, &ch) == APR_SUCCESS)
  +    if (ap_getc(&ch, cfp) == APR_SUCCESS)
           return ch;
       return (int)EOF;
   }
  @@ -849,7 +849,7 @@
   static void *cfg_getstr(void *buf, size_t bufsiz, void *param)
   {
       ap_file_t *cfp = (ap_file_t *) param;
  -    if (ap_fgets(cfp, buf, bufsiz) == APR_SUCCESS)
  +    if (ap_fgets(buf, bufsiz, cfp) == APR_SUCCESS)
           return buf;
       return NULL;
   }
  @@ -888,7 +888,7 @@
       if (stat != APR_SUCCESS)
           return NULL;
   
  -    if (ap_get_filetype(file, &type) == APR_SUCCESS &&
  +    if (ap_get_filetype(&type, file) == APR_SUCCESS &&
           type != APR_REG &&
   #if defined(WIN32) || defined(OS2)
           !(strcasecmp(name, "nul") == 0 ||
  
  
  
  1.10      +3 -3      apache-2.0/src/modules/mpm/dexter/acceptlock.c
  
  Index: acceptlock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/acceptlock.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- acceptlock.c	1999/10/04 16:38:06	1.9
  +++ acceptlock.c	1999/10/06 23:04:11	1.10
  @@ -508,7 +508,7 @@
           lock_fname = expand_lock_fname(p, i);
           ap_open(&tempfile, p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
                   APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD);
  -        ap_get_os_file(tempfile, &lock_fd[i]);
  +        ap_get_os_file(&lock_fd[i], tempfile);
   	if (lock_fd[i] == -1) {
   	    perror("open");
   	    fprintf(stderr, "Cannot open lock file: %s\n", lock_fname);
  @@ -581,7 +581,7 @@
           char *lock_fname = expand_lock_fname(p, i);
       
           ap_open(&tempfile, p, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE);
  -        ap_get_os_file(tempfile, &lock_fd[i]);
  +        ap_get_os_file(&lock_fd[i], tempfile);
           if (lock_fd[i] == -1) {
   	  ap_log_error(APLOG_MARK, APLOG_EMERG, 
   		       (const server_rec *)ap_get_server_conf(),
  @@ -608,7 +608,7 @@
           lock_fname = expand_lock_fname(p, i);
           unlink(lock_fname);
           ap_open(&tempfile, p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL, APR_UREAD | APR_UWRITE);
  -        ap_get_os_file(tempfile, &lock_fd[i]);
  +        ap_get_os_file(&lock_fd[i], tempfile);
           if (lock_fd[i] == -1) {
   	    ap_log_error(APLOG_MARK, APLOG_EMERG, 
   			 (const server_rec *) ap_get_server_conf(), 
  
  
  
  1.11      +3 -3      apache-2.0/src/modules/mpm/mpmt_pthread/acceptlock.c
  
  Index: acceptlock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/acceptlock.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- acceptlock.c	1999/10/04 16:38:11	1.10
  +++ acceptlock.c	1999/10/06 23:04:12	1.11
  @@ -506,7 +506,7 @@
           lock_fname = expand_lock_fname(p, i);
           ap_open(&tempfile, p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL, 
                   APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD);
  -	ap_get_os_file(tempfile, &lock_fd[i]);
  +	ap_get_os_file(&lock_fd[i], tempfile);
   	if (lock_fd[i] == -1) {
   	    perror("open");
   	    fprintf(stderr, "Cannot open lock file: %s\n", lock_fname);
  @@ -579,7 +579,7 @@
           char *lock_fname = expand_lock_fname(p, i);
       
           ap_open(&tempfile, p, lock_fname, APR_WRITE, APR_UREAD | APR_UWRITE);
  -        ap_get_os_file(tempfile, &lock_fd[i]);
  +        ap_get_os_file(&lock_fd[i], tempfile);
           if (lock_fd[i] == -1) {
   	  ap_log_error(APLOG_MARK, APLOG_EMERG, 
   		       (const server_rec *)ap_get_server_conf(),
  @@ -607,7 +607,7 @@
           unlink(lock_fname);
           ap_open(p, lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
                   APR_UREAD | APR_UWRITE, &tempfile);
  -        ap_get_os_file(tempfile, &lock_fd[i]);
  +        ap_get_os_file(&lock_fd[i], tempfile);
           if (lock_fd[i] == -1) {
   	    ap_log_error(APLOG_MARK, APLOG_EMERG, 
   			 (const server_rec *) ap_get_server_conf(), 
  
  
  
  1.6       +2 -2      apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- scoreboard.c	1999/09/11 15:58:37	1.5
  +++ scoreboard.c	1999/10/06 23:04:13	1.6
  @@ -454,7 +454,7 @@
       ap_open(p, ap_scoreboard_fname, APR_CREATE | APR_BINARY | APR_READ | APR_WRITE,
               APR_UREAD | APR_UWRITE | APR_GREAD | APR_GWRITE | APR_WREAD | APR_WWRITE,
               &scoreboard_file);
  -    ap_get_os_file(scoreboard_file, &scoreboard_fd);
  +    ap_get_os_file(&scoreboard_fd, scoreboard_file);
       if (scoreboard_fd == -1) {
   	perror(ap_scoreboard_fname);
   	fprintf(stderr, "Cannot open scoreboard file:\n");
  @@ -482,7 +482,7 @@
   
       ap_open(p, ap_scoreboard_fname, APR_CREATE | APR_BINARY | APR_READ | APR_WRITE,
               APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, &scoreboard_file);
  -    ap_get_os_file(scoreboard_file, &scoreboard_fd);
  +    ap_get_os_file(&scoreboard_fd, scoreboard_file);
       if (scoreboard_fd == -1) {
   	perror(ap_scoreboard_fname);
   	fprintf(stderr, "Cannot open scoreboard file:\n");
  
  
  
  1.38      +3 -3      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- prefork.c	1999/10/05 11:57:40	1.37
  +++ prefork.c	1999/10/06 23:04:14	1.38
  @@ -544,7 +544,7 @@
       expand_lock_fname(p);
       ap_open(&tempfile, p, ap_lock_fname, APR_CREATE | APR_WRITE | APR_EXCL,
               APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD);
  -    ap_get_os_file(tempfile, &lock_fd);
  +    ap_get_os_file(&lock_fd, tempfile);
       if (lock_fd == -1) {
   	perror("open");
   	fprintf(stderr, "Cannot open lock file: %s\n", ap_lock_fname);
  @@ -611,7 +611,7 @@
   		    "Child cannot open lock file: %s", ap_lock_fname);
   	clean_child_exit(APEXIT_CHILDINIT);
       }
  -    ap_get_os_file(tempfile, &lock_fd);
  +    ap_get_os_file(&lock_fd, tempfile);
   }
   
   /*
  @@ -631,7 +631,7 @@
   		    "Parent cannot open lock file: %s", ap_lock_fname);
   	exit(APEXIT_INIT);
       }
  -    ap_get_os_file(tempfile, &lock_fd);
  +    ap_get_os_file(&lock_fd, tempfile);
       ap_register_cleanup(p, NULL, accept_mutex_cleanup, ap_null_cleanup);
   }
   
  
  
  
  1.7       +1 -1      apache-2.0/src/modules/standard/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_asis.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_asis.c	1999/10/05 11:57:41	1.6
  +++ mod_asis.c	1999/10/06 23:04:15	1.7
  @@ -86,7 +86,7 @@
   	return FORBIDDEN;
       }
   
  -    ap_get_os_file(f, &thefd); 
  +    ap_get_os_file(&thefd, f); 
       thefile = fdopen(thefd, "r");
       
       ap_scan_script_header_err(r, thefile, NULL);
  
  
  
  1.8       +1 -1      apache-2.0/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_autoindex.c	1999/10/04 16:38:16	1.7
  +++ mod_autoindex.c	1999/10/06 23:04:15	1.8
  @@ -1513,7 +1513,7 @@
       char keyid;
       char direction;
   
  -    if (ap_opendir(&d, r->pool, name) != APR_SUCCESS) {
  +    if (ap_opendir(&d, name, r->pool) != APR_SUCCESS) {
   	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "Can't open directory for index: %s", r->filename);
   	return HTTP_FORBIDDEN;
  
  
  
  1.8       +8 -8      apache-2.0/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_negotiation.c	1999/10/04 17:24:52	1.7
  +++ mod_negotiation.c	1999/10/06 23:04:16	1.8
  @@ -644,7 +644,7 @@
       /* Get a noncommented line */
   
       do {
  -        if (ap_fgets(map, buffer, MAX_STRING_LEN) != APR_SUCCESS) {
  +        if (ap_fgets(buffer, MAX_STRING_LEN, map) != APR_SUCCESS) {
               return header_eof;
           }
       } while (buffer[0] == '#');
  @@ -665,10 +665,10 @@
   
       cp += strlen(cp);
   
  -    while (ap_getc(map, &c) != APR_EOF) {
  +    while (ap_getc(&c, map) != APR_EOF) {
           if (c == '#') {
               /* Comment line */
  -            while (ap_getc(map, &c) != EOF && c != '\n') {
  +            while (ap_getc(&c, map) != EOF && c != '\n') {
                   continue;
               }
           }
  @@ -679,11 +679,11 @@
                */
   
               while (c != '\n' && ap_isspace(c)) {
  -                if(ap_getc(map, &c) != APR_SUCCESS)
  +                if(ap_getc(&c, map) != APR_SUCCESS)
   		    break;
               }
   
  -            ap_ungetc(map, c);
  +            ap_ungetc(c, map);
   
               if (c == '\n') {
                   return header_seen;     /* Blank line */
  @@ -691,7 +691,7 @@
   
               /* Continuation */
   
  -            while (cp < buf_end - 2 && (ap_getc(map, &c)) != EOF && c != '\n') {
  +            while (cp < buf_end - 2 && (ap_getc(&c, map)) != EOF && c != '\n') {
                   *cp++ = c;
               }
   
  @@ -702,7 +702,7 @@
   
               /* Line beginning with something other than whitespace */
   
  -            ap_ungetc(map, c);
  +            ap_ungetc(c, map);
               return header_seen;
           }
       }
  @@ -908,7 +908,7 @@
       ++filp;
       prefix_len = strlen(filp);
   
  -    if (ap_opendir(&dirp, neg->pool, neg->dir_name) != APR_SUCCESS) {
  +    if (ap_opendir(&dirp, neg->dir_name, neg->pool) != APR_SUCCESS) {
           ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                       "cannot read directory for multi: %s", neg->dir_name);
           return HTTP_FORBIDDEN;
  
  
  

Mime
View raw message