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
Date Mon, 21 Jun 1999 18:28:12 GMT
rbb         99/06/21 11:28:11

  Modified:    apr/file_io/unix fileacc.c
               apr/include apr_config.h.in
               include  apr_file_io.h
  Log:
  Update APR to make it compile again.  That'll teach me to save code for a week
  before I commit it.
  
  Revision  Changes    Path
  1.14      +22 -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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- fileacc.c	1999/06/21 17:45:54	1.13
  +++ fileacc.c	1999/06/21 18:28:09	1.14
  @@ -200,19 +200,35 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_filecontext(ap_file_t *, struct context_t *)
  + * ap_status_t ap_get_filedata(ap_file_t *, void *)
    *    Return the context associated with the current file.
    * arg 1) The currently open file.
  - * arg 2) The context associated with the file.  
  + * arg 2) The user data associated with the file.  
    */                     
  -ap_status_t ap_get_filecontext(struct file_t *file, struct context_t *cont)
  +ap_status_t ap_get_filedata(struct file_t *file, void *data)
   {    
       if (file != NULL) {
  -        *cont = file->cntxt;
  -        return APR_SUCCESS;
  +        return ap_get_userdata(file->cntxt, &data);
       }
       else {
  -        cont = NULL;
  +        data = NULL;
  +        return APR_ENOFILE;
  +    }
  +}
  +
  +/* ***APRDOC********************************************************
  + * ap_status_t ap_set_filedata(ap_file_t *, void *)
  + *    Return the context associated with the current file.
  + * arg 1) The currently open file.
  + * arg 2) The user data to associate with the file.  
  + */                     
  +ap_status_t ap_set_filedata(struct file_t *file, void *data)
  +{    
  +    if (file != NULL) {
  +        return ap_set_userdata(file->cntxt, data);
  +    }
  +    else {
  +        data = NULL;
           return APR_ENOFILE;
       }
   }
  
  
  
  1.9       +2 -0      apache-apr/apr/include/apr_config.h.in
  
  Index: apr_config.h.in
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/include/apr_config.h.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- apr_config.h.in	1999/06/17 15:05:19	1.8
  +++ apr_config.h.in	1999/06/21 18:28:10	1.9
  @@ -467,6 +467,8 @@
   #define API_EXPORT(type) type
   #define API_EXPORT_NONSTD(type) type
   
  +#define API_THREAD_FUNC
  +
   /*
    * A set of flags which indicate places where the server should raise(SIGSTOP).
    * This is useful for debugging, because you can then attach to that process
  
  
  
  1.35      +2 -1      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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- apr_file_io.h	1999/06/21 17:45:53	1.34
  +++ apr_file_io.h	1999/06/21 18:28:11	1.35
  @@ -130,7 +130,8 @@
   /*accessor and general file_io functions. */
   ap_status_t ap_get_filename(ap_file_t *, char **);
   ap_status_t ap_get_dir_filename(ap_dir_t *, char **);
  -ap_status_t ap_get_filecontext(ap_file_t *, ap_context_t **);
  +ap_status_t ap_get_filedata(ap_file_t *, void *);
  +ap_status_t ap_set_filedata(ap_file_t *, 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 *);
  
  
  

Mime
View raw message