cvs commit: apache-2.0/src/lib/apr/file_io/win32 open.c dir.c fileacc.c

[stoddard]

stoddard    99/10/04 18:11:51

  Modified:    src/lib/apr/file_io/win32 open.c dir.c fileacc.c
  Log:
  More argument swaps...
  
  Revision  Changes    Path
  1.3       +4 -4      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- open.c    1999/09/22 17:53:18     1.2
  +++ open.c    1999/10/05 01:11:48     1.3
  @@ -77,8 +77,8 @@
       }
   }
   
  -ap_status_t ap_open(ap_context_t *cont, const char *fname, ap_int32_t flag, 
ap_fileperms_t perm,
  -                                     struct file_t **dafile)
  +ap_status_t ap_open(struct file_t **dafile, ap_context_t *cont, const char 
*fname, 
  +                    ap_int32_t flag, ap_fileperms_t perm)
   {
       DWORD oflags = 0;
       DWORD createflags = 0;
  @@ -172,8 +172,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_file(ap_context_t *cont, struct file_t **file, 
  -                            ap_os_file_t *thefile)
  +ap_status_t ap_put_os_file(struct file_t **file, ap_os_file_t *thefile, 
  +                           ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  
  
  
  1.3       +2 -3      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- dir.c     1999/10/04 16:36:52     1.2
  +++ dir.c     1999/10/05 01:11:49     1.3
  @@ -137,7 +137,7 @@
                return APR_SUCCESS;
        }
       if ((stat = ap_closedir(thedir)) == APR_SUCCESS) {
  -             if ((stat = ap_opendir(cont, temp, &thedir)) == APR_SUCCESS) {
  +             if ((stat = ap_opendir(&thedir, cont, temp)) == APR_SUCCESS) {
                        ap_readdir(thedir);
                        return APR_SUCCESS;
                }
  @@ -218,8 +218,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_dir(ap_context_t *cont, struct dir_t **dir,
  -                            ap_os_dir_t *thedir)
  +ap_status_t ap_put_os_dir(struct dir_t **dir, ap_os_dir_t *thedir, 
ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/file_io/win32/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileacc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- fileacc.c 1999/10/04 16:36:52     1.4
  +++ fileacc.c 1999/10/05 01:11:49     1.5
  @@ -183,7 +183,7 @@
   ap_status_t ap_get_filedata(struct file_t *file, char *key, void *data)
   {    
       if (file != NULL) {
  -        return ap_get_userdata(file->cntxt, key, &data);
  +        return ap_get_userdata(&data, file->cntxt, key);
       }
       else {
           data = NULL;