httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/include apr_file_io.h
Date Mon, 03 Apr 2000 17:14:12 GMT
rbb         00/04/03 10:14:12

  Modified:    src/lib/apr APRDesign
               src/lib/apr/file_io/beos readwrite.c
               src/lib/apr/file_io/os2 fileacc.c filedup.c fileio.h
                        filestat.c open.c pipe.c readwrite.c seek.c
               src/lib/apr/file_io/unix fileacc.c filedup.c fileio.h
                        filestat.c open.c pipe.c readwrite.c seek.c
               src/lib/apr/file_io/win32 fileacc.c filedup.c fileio.h
                        filestat.c open.c pipe.c readwrite.c seek.c
               src/lib/apr/include apr_file_io.h
  Log:
  Change struct file_t to struct ap_file_t.  This clarifies things a bit that
  APR defines both the struct and typedef's it.  This is also the way things
  should have been coded originally, so this just fixes it.  Expect more of
  these patches today.
  
  Revision  Changes    Path
  1.6       +2 -2      apache-2.0/src/lib/apr/APRDesign
  
  Index: APRDesign
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/APRDesign,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- APRDesign	2000/03/27 23:02:11	1.5
  +++ APRDesign	2000/04/03 17:14:02	1.6
  @@ -128,7 +128,7 @@
   Those structures are then typedef'ed in an external header file.  For example
   in file_io/unix/fileio.h:
   
  -    struct file_t {
  +    struct ap_file_t {
           ap_context_t *cntxt;
           int filedes;
           FILE *filehand;
  @@ -136,7 +136,7 @@
       }
   
   In include/apr_file_io.h:
  -    typedef struct file_t    ap_file_t;
  +    typedef struct ap_file_t    ap_file_t;
   
   This will cause a compiler error if somebody tries to access the filedes field
   in this strcture.  Windows does not have a filedes field, so obviously, it is
  
  
  
  1.12      +4 -4      apache-2.0/src/lib/apr/file_io/beos/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/beos/readwrite.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- readwrite.c	2000/03/31 08:35:47	1.11
  +++ readwrite.c	2000/04/03 17:14:03	1.12
  @@ -54,7 +54,7 @@
   
   #include "../unix/fileio.h"
   
  -ap_status_t ap_read(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
  +ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
   {
       ap_ssize_t rv;
   
  @@ -81,7 +81,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_write(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
  +ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
   {
       ap_size_t rv;
   
  @@ -105,7 +105,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_writev(struct file_t *thefile, const struct iovec *vec, 
  +ap_status_t ap_writev(struct ap_file_t *thefile, const struct iovec *vec, 
                         ap_size_t nvec, ap_ssize_t *nbytes)
   {
       int bytes;
  @@ -246,7 +246,7 @@
   }
   #endif
   
  -API_EXPORT(int) ap_fprintf(struct file_t *fptr, const char *format, ...)
  +API_EXPORT(int) ap_fprintf(struct ap_file_t *fptr, const char *format, ...)
   {
       int cc;
       va_list ap;
  
  
  
  1.9       +4 -4      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- fileacc.c	2000/03/31 08:35:47	1.8
  +++ fileacc.c	2000/04/03 17:14:03	1.9
  @@ -60,9 +60,9 @@
   #include <string.h>
   #include <sys/types.h>
   
  -/* A file to put ALL of the accessor functions for struct file_t types. */
  +/* A file to put ALL of the accessor functions for struct ap_file_t types. */
   
  -ap_status_t ap_get_filename(char **new, struct file_t *thefile)
  +ap_status_t ap_get_filename(char **new, struct ap_file_t *thefile)
   {
       if (thefile != NULL) {
           *new = ap_pstrdup(thefile->cntxt, thefile->fname);
  @@ -75,7 +75,7 @@
   
   
   
  -ap_status_t ap_get_filedata(void **data, char *key, struct file_t *file)
  +ap_status_t ap_get_filedata(void **data, char *key, struct ap_file_t *file)
   {    
       if (file != NULL) {
           return ap_get_userdata(data, key, file->cntxt);
  @@ -88,7 +88,7 @@
   
   
   
  -ap_status_t ap_set_filedata(struct file_t *file, void *data, char *key,
  +ap_status_t ap_set_filedata(struct ap_file_t *file, void *data, char *key,
                               ap_status_t (*cleanup) (void *))
   {    
       if (file != NULL) {
  
  
  
  1.10      +3 -3      apache-2.0/src/lib/apr/file_io/os2/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filedup.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- filedup.c	2000/03/31 08:35:47	1.9
  +++ filedup.c	2000/04/03 17:14:03	1.10
  @@ -60,13 +60,13 @@
   #define INCL_DOS
   #include <os2.h>
   
  -ap_status_t ap_dupfile(struct file_t **new_file, struct file_t *old_file)
  +ap_status_t ap_dupfile(struct ap_file_t **new_file, struct ap_file_t *old_file)
   {
       int rv;
  -    struct file_t *dup_file;
  +    struct ap_file_t *dup_file;
   
       if (*new_file == NULL) {
  -        dup_file = (struct file_t *)ap_palloc(old_file->cntxt, sizeof(struct file_t));
  +        dup_file = (struct ap_file_t *)ap_palloc(old_file->cntxt, sizeof(struct ap_file_t));
   
           if (dup_file == NULL) {
               return APR_ENOMEM;
  
  
  
  1.12      +1 -1      apache-2.0/src/lib/apr/file_io/os2/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileio.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- fileio.h	2000/03/31 08:35:47	1.11
  +++ fileio.h	2000/04/03 17:14:04	1.12
  @@ -65,7 +65,7 @@
   
   #define APR_FILE_BUFSIZE 4096
   
  -struct file_t {
  +struct ap_file_t {
       ap_context_t *cntxt;
       HFILE filedes;
       char * fname;
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/file_io/os2/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filestat.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- filestat.c	2000/03/31 08:35:47	1.5
  +++ filestat.c	2000/04/03 17:14:04	1.6
  @@ -109,7 +109,7 @@
   
   
   
  -ap_status_t ap_getfileinfo(ap_finfo_t *finfo, struct file_t *thefile)
  +ap_status_t ap_getfileinfo(ap_finfo_t *finfo, struct ap_file_t *thefile)
   {
       ULONG rc;
       FILESTATUS3 fstatus;
  
  
  
  1.18      +8 -8      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- open.c	2000/03/31 08:35:48	1.17
  +++ open.c	2000/04/03 17:14:04	1.18
  @@ -63,19 +63,19 @@
   
   ap_status_t apr_file_cleanup(void *thefile)
   {
  -    struct file_t *file = thefile;
  +    struct ap_file_t *file = thefile;
       return ap_close(file);
   }
   
   
   
  -ap_status_t ap_open(struct file_t **new, const char *fname, ap_int32_t flag,  ap_fileperms_t
perm, ap_context_t *cntxt)
  +ap_status_t ap_open(struct ap_file_t **new, const char *fname, ap_int32_t flag,  ap_fileperms_t
perm, ap_context_t *cntxt)
   {
       int oflags = 0;
       int mflags = OPEN_FLAGS_FAIL_ON_ERROR|OPEN_SHARE_DENYNONE;
       int rv;
       ULONG action;
  -    ap_file_t *dafile = (struct file_t *)ap_palloc(cntxt, sizeof(struct file_t));
  +    ap_file_t *dafile = (struct ap_file_t *)ap_palloc(cntxt, sizeof(struct ap_file_t));
   
       *new = dafile;
       dafile->cntxt = cntxt;
  @@ -179,7 +179,7 @@
   
   
   
  -ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct file_t *file)
  +ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct ap_file_t *file)
   {
       if (file == NULL) {
           return APR_ENOFILE;
  @@ -191,11 +191,11 @@
   
   
   
  -ap_status_t ap_put_os_file(struct file_t **file, ap_os_file_t *thefile, ap_context_t *cont)
  +ap_status_t ap_put_os_file(struct ap_file_t **file, ap_os_file_t *thefile, ap_context_t
*cont)
   {
       ap_os_file_t *dafile = thefile;
       if ((*file) == NULL) {
  -        (*file) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
  +        (*file) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t));
           (*file)->cntxt = cont;
       }
       (*file)->filedes = *dafile;
  @@ -218,9 +218,9 @@
   
   
   
  -ap_status_t ap_open_stderr(struct file_t **thefile, ap_context_t *cont)
  +ap_status_t ap_open_stderr(struct ap_file_t **thefile, ap_context_t *cont)
   {
  -    (*thefile) = ap_palloc(cont, sizeof(struct file_t));
  +    (*thefile) = ap_palloc(cont, sizeof(struct ap_file_t));
       if ((*thefile) == NULL) {
           return APR_ENOMEM;
       }
  
  
  
  1.11      +4 -4      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- pipe.c	2000/03/31 08:35:48	1.10
  +++ pipe.c	2000/04/03 17:14:04	1.11
  @@ -58,7 +58,7 @@
   #include "apr_lib.h"
   #include <string.h>
   
  -ap_status_t ap_create_pipe(struct file_t **in, struct file_t **out, ap_context_t *cont)
  +ap_status_t ap_create_pipe(struct ap_file_t **in, struct ap_file_t **out, ap_context_t
*cont)
   {
       ULONG filedes[2];
       ULONG rc;
  @@ -69,7 +69,7 @@
           return os2errno(rc);
       }
       
  -    (*in) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
  +    (*in) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t));
       (*in)->cntxt = cont;
       (*in)->filedes = filedes[0];
       (*in)->fname = ap_pstrdup(cont, "PIPE");
  @@ -78,7 +78,7 @@
       (*in)->flags = 0;
       ap_register_cleanup(cont, *in, apr_file_cleanup, ap_null_cleanup);
   
  -    (*out) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
  +    (*out) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t));
       (*out)->cntxt = cont;
       (*out)->filedes = filedes[1];
       (*out)->fname = ap_pstrdup(cont, "PIPE");
  @@ -100,7 +100,7 @@
   
    
   
  -ap_status_t ap_set_pipe_timeout(struct file_t *thepipe, ap_int32_t timeout)
  +ap_status_t ap_set_pipe_timeout(struct ap_file_t *thepipe, ap_int32_t timeout)
   {
       return APR_ENOTIMPL;
   }
  
  
  
  1.16      +4 -4      apache-2.0/src/lib/apr/file_io/os2/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/readwrite.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- readwrite.c	2000/03/31 08:35:48	1.15
  +++ readwrite.c	2000/04/03 17:14:04	1.16
  @@ -60,7 +60,7 @@
   #include <os2.h>
   #include <malloc.h>
   
  -ap_status_t ap_read(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
  +ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
   {
       ULONG rc = 0;
       ULONG bytesread;
  @@ -126,7 +126,7 @@
   
   
   
  -ap_status_t ap_write(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
  +ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
   {
       ULONG rc = 0;
       ULONG byteswritten;
  @@ -182,7 +182,7 @@
   
   #ifdef HAVE_WRITEV
   
  -ap_status_t ap_writev(struct file_t *thefile, const struct iovec *vec, ap_size_t nvec,
ap_ssize_t *nbytes)
  +ap_status_t ap_writev(struct ap_file_t *thefile, const struct iovec *vec, ap_size_t nvec,
ap_ssize_t *nbytes)
   {
       int bytes;
       if ((bytes = writev(thefile->filedes, vec, nvec)) < 0) {
  @@ -313,7 +313,7 @@
   
   
   
  -API_EXPORT(int) ap_fprintf(struct file_t *fptr, const char *format, ...)
  +API_EXPORT(int) ap_fprintf(struct ap_file_t *fptr, const char *format, ...)
   {
       int cc;
       va_list ap;
  
  
  
  1.6       +2 -2      apache-2.0/src/lib/apr/file_io/os2/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/seek.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- seek.c	2000/03/31 08:35:48	1.5
  +++ seek.c	2000/04/03 17:14:04	1.6
  @@ -65,7 +65,7 @@
   
   
   
  -static ap_status_t setptr(struct file_t *thefile, unsigned long pos )
  +static ap_status_t setptr(struct ap_file_t *thefile, unsigned long pos )
   {
       long newbufpos;
       ULONG rc;
  @@ -91,7 +91,7 @@
   
   
   
  -ap_status_t ap_seek(struct file_t *thefile, ap_seek_where_t where, ap_off_t *offset)
  +ap_status_t ap_seek(struct ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset)
   {
       if (!thefile->isopen) {
           return APR_EBADF;
  
  
  
  1.20      +4 -4      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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- fileacc.c	2000/04/03 16:03:14	1.19
  +++ fileacc.c	2000/04/03 17:14:06	1.20
  @@ -54,7 +54,7 @@
   
   #include "fileio.h"
   
  -/* A file to put ALL of the accessor functions for struct file_t types. */
  +/* A file to put ALL of the accessor functions for struct ap_file_t types. */
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_get_filename(char **new, ap_file_t *thefile)
  @@ -62,7 +62,7 @@
    * arg 1) The path of the file.  
    * arg 2) The currently open file.
    */                     
  -ap_status_t ap_get_filename(char **new, struct file_t *thefile)
  +ap_status_t ap_get_filename(char **new, struct ap_file_t *thefile)
   {
       if(new == NULL)
           return APR_EBADARG;
  @@ -112,7 +112,7 @@
    * arg 2) The key to use for retreiving data associated with this file.
    * arg 3) The currently open file.
    */                     
  -ap_status_t ap_get_filedata(void **data, char *key, struct file_t *file)
  +ap_status_t ap_get_filedata(void **data, char *key, struct ap_file_t *file)
   {    
       if(data == NULL || key == NULL)
           return APR_EBADARG;
  @@ -135,7 +135,7 @@
    * arg 3) The key to use for assocaiteing data with the file.
    * arg 4) The cleanup routine to use when the file is destroyed.
    */                     
  -ap_status_t ap_set_filedata(struct file_t *file, void *data, char *key,
  +ap_status_t ap_set_filedata(struct ap_file_t *file, void *data, char *key,
                               ap_status_t (*cleanup) (void *))
   {    
       if(data == NULL || key == NULL)
  
  
  
  1.13      +3 -3      apache-2.0/src/lib/apr/file_io/unix/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filedup.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- filedup.c	2000/04/03 16:03:14	1.12
  +++ filedup.c	2000/04/03 17:14:06	1.13
  @@ -61,7 +61,7 @@
    * arg 2) The file to duplicate.
    * NOTE: *arg1 must point to a valid ap_file_t, or point to NULL
    */         
  -ap_status_t ap_dupfile(struct file_t **new_file, struct file_t *old_file)
  +ap_status_t ap_dupfile(struct ap_file_t **new_file, struct ap_file_t *old_file)
   {
       char *buf_oflags;
       int have_file = 0;
  @@ -70,8 +70,8 @@
           return APR_EBADARG;
   
       if ((*new_file) == NULL) {
  -        (*new_file) = (struct file_t *)ap_pcalloc(old_file->cntxt,
  -                                   sizeof(struct file_t));
  +        (*new_file) = (struct ap_file_t *)ap_pcalloc(old_file->cntxt,
  +                                   sizeof(struct ap_file_t));
           if ((*new_file) == NULL) {
               return APR_ENOMEM;
           }
  
  
  
  1.11      +1 -1      apache-2.0/src/lib/apr/file_io/unix/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- fileio.h	2000/03/31 08:35:49	1.10
  +++ fileio.h	2000/04/03 17:14:06	1.11
  @@ -100,7 +100,7 @@
   #endif
   /* End System headers */
   
  -struct file_t {
  +struct ap_file_t {
       ap_context_t *cntxt;
       int filedes;
       FILE *filehand;
  
  
  
  1.18      +1 -1      apache-2.0/src/lib/apr/file_io/unix/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filestat.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- filestat.c	2000/04/03 16:03:14	1.17
  +++ filestat.c	2000/04/03 17:14:07	1.18
  @@ -86,7 +86,7 @@
    * arg 1) Where to store the information about the file.
    * arg 2) The file to get information about. 
    */ 
  -ap_status_t ap_getfileinfo(ap_finfo_t *finfo, struct file_t *thefile)
  +ap_status_t ap_getfileinfo(ap_finfo_t *finfo, struct ap_file_t *thefile)
   {
       struct stat info;
       int rv;
  
  
  
  1.36      +9 -9      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.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- open.c	2000/04/03 16:03:15	1.35
  +++ open.c	2000/04/03 17:14:07	1.36
  @@ -57,7 +57,7 @@
   
   ap_status_t file_cleanup(void *thefile)
   {
  -    struct file_t *file = thefile;
  +    struct ap_file_t *file = thefile;
       int rv;
   
       if (file->buffered) {
  @@ -100,7 +100,7 @@
    *        called without any mode parameters.  *arg1 must point to a valid
    *        file_t, or NULL (in which case it will be allocated)
    */
  -ap_status_t ap_open(struct file_t **new, const char *fname, ap_int32_t flag,  ap_fileperms_t
perm, ap_context_t *cont)
  +ap_status_t ap_open(struct ap_file_t **new, const char *fname, ap_int32_t flag,  ap_fileperms_t
perm, ap_context_t *cont)
   {
       int oflags = 0;
       char *buf_oflags;
  @@ -112,7 +112,7 @@
           return APR_ENOCONT;
   
       if ((*new) == NULL) {
  -        (*new) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
  +        (*new) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t));
       }
   
       (*new)->cntxt = cont;
  @@ -196,7 +196,7 @@
    *    Close the specified file.
    * arg 1) The file descriptor to close.
    */
  -ap_status_t ap_close(struct file_t *file)
  +ap_status_t ap_close(struct ap_file_t *file)
   {
       ap_status_t rv;
     
  @@ -239,7 +239,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(ap_os_file_t *thefile, struct file_t *file)
  +ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct ap_file_t *file)
   {
       if (thefile == NULL)
           return APR_EBADARG;
  @@ -267,7 +267,7 @@
    * NOTE:  On Unix, it is only possible to put a file descriptor into
    *        an apr file type.
    */
  -ap_status_t ap_put_os_file(struct file_t **file, ap_os_file_t *thefile,
  +ap_status_t ap_put_os_file(struct ap_file_t **file, ap_os_file_t *thefile,
                              ap_context_t *cont)
   {
       int *dafile = thefile;
  @@ -279,7 +279,7 @@
           return APR_ENOCONT;
   
       if ((*file) == NULL) {
  -        (*file) = ap_pcalloc(cont, sizeof(struct file_t));
  +        (*file) = ap_pcalloc(cont, sizeof(struct ap_file_t));
           (*file)->cntxt = cont;
       }
       /* if we are putting in a new file descriptor, then we don't really
  @@ -340,7 +340,7 @@
    * arg 1) The apr file to use as stderr.
    * arg 2) The context to allocate the file out of.
    */
  -ap_status_t ap_open_stderr(struct file_t **thefile, ap_context_t *cont)
  +ap_status_t ap_open_stderr(struct ap_file_t **thefile, ap_context_t *cont)
   {
       if (thefile == NULL)
           return APR_EBADARG;
  @@ -348,7 +348,7 @@
       if (cont == NULL)
           return APR_ENOCONT;
   
  -    (*thefile) = ap_pcalloc(cont, sizeof(struct file_t));
  +    (*thefile) = ap_pcalloc(cont, sizeof(struct ap_file_t));
       if ((*thefile) == NULL) {
           return APR_ENOMEM;
       }
  
  
  
  1.18      +5 -5      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- pipe.c	2000/04/03 16:03:15	1.17
  +++ pipe.c	2000/04/03 17:14:07	1.18
  @@ -54,7 +54,7 @@
   
   #include "fileio.h"
   
  -static ap_status_t pipenonblock(struct file_t *thefile)
  +static ap_status_t pipenonblock(struct ap_file_t *thefile)
   {
   #ifndef BEOS /* this code won't work on BeOS */
       int fd_flags = fcntl(thefile->filedes, F_GETFL, 0);
  @@ -84,7 +84,7 @@
    * arg 3) The timeout value in seconds.  Values < 0 mean wait forever, 0
    *        means do not wait at all.
    */
  -ap_status_t ap_set_pipe_timeout(struct file_t *thepipe, ap_int32_t timeout)
  +ap_status_t ap_set_pipe_timeout(struct ap_file_t *thepipe, ap_int32_t timeout)
   {
       if(thepipe == NULL)
           return APR_EBADARG;
  @@ -104,7 +104,7 @@
    * arg 2) The file descriptor to use as output from the pipe.
    * arg 3) The context to operate on.
    */
  -ap_status_t ap_create_pipe(struct file_t **in, struct file_t **out, ap_context_t *cont)
  +ap_status_t ap_create_pipe(struct ap_file_t **in, struct ap_file_t **out, ap_context_t
*cont)
   {
       int filedes[2];
   
  @@ -118,7 +118,7 @@
           return errno;
       }
       
  -    (*in) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
  +    (*in) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t));
       (*in)->cntxt = cont;
       (*in)->filedes = filedes[0];
       (*in)->buffered = 0;
  @@ -126,7 +126,7 @@
       (*in)->fname = ap_pstrdup(cont, "PIPE");
       (*in)->timeout = -1;
   
  -    (*out) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
  +    (*out) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t));
       (*out)->cntxt = cont;
       (*out)->filedes = filedes[1];
       (*out)->buffered = 0;
  
  
  
  1.31      +4 -4      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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- readwrite.c	2000/04/03 16:03:15	1.30
  +++ readwrite.c	2000/04/03 17:14:07	1.31
  @@ -65,7 +65,7 @@
    * the available data is read.  The third argument is modified to reflect the
    * number of bytes read. 
    */
  -ap_status_t ap_read(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
  +ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
   {
       ap_ssize_t rv;
   
  @@ -147,7 +147,7 @@
    * can.  The third argument is modified to reflect the * number of bytes 
    * written. 
    */
  -ap_status_t ap_write(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
  +ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
   {
       ap_size_t rv;
   
  @@ -223,7 +223,7 @@
    * arg 4) The number of bytes written.
    */
   #ifdef HAVE_WRITEV
  -ap_status_t ap_writev(struct file_t *thefile, const struct iovec *vec,
  +ap_status_t ap_writev(struct ap_file_t *thefile, const struct iovec *vec,
                         ap_size_t nvec, ap_ssize_t *nbytes)
   {
       int bytes;
  @@ -423,7 +423,7 @@
   }
   #endif
   
  -API_EXPORT(int) ap_fprintf(struct file_t *fptr, const char *format, ...)
  +API_EXPORT(int) ap_fprintf(struct ap_file_t *fptr, const char *format, ...)
   {
       int cc;
       va_list ap;
  
  
  
  1.7       +1 -1      apache-2.0/src/lib/apr/file_io/unix/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/seek.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- seek.c	2000/03/31 08:35:50	1.6
  +++ seek.c	2000/04/03 17:14:08	1.7
  @@ -67,7 +67,7 @@
    * NOTE:  The third argument is modified to be the offset the pointer
    *        was actually moved to.
    */
  -ap_status_t ap_seek(struct file_t *thefile, ap_seek_where_t where, ap_off_t *offset)
  +ap_status_t ap_seek(struct ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset)
   {
       ap_off_t rv;
       if (thefile->buffered) {
  
  
  
  1.13      +5 -5      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- fileacc.c	2000/03/31 08:35:51	1.12
  +++ fileacc.c	2000/04/03 17:14:09	1.13
  @@ -60,9 +60,9 @@
   #include <string.h>
   #include <sys/types.h>
   
  -/* A file to put ALL of the accessor functions for struct file_t types. */
  +/* A file to put ALL of the accessor functions for struct ap_file_t types. */
   
  -ap_status_t ap_get_filename(char **new, struct file_t *thefile)
  +ap_status_t ap_get_filename(char **new, struct ap_file_t *thefile)
   {
       if (thefile != NULL) {
           *new = ap_pstrdup(thefile->cntxt, thefile->fname);
  @@ -104,7 +104,7 @@
   
   
   /*
  -ap_status_t ap_get_fileperms(ap_fileperms_t *perm, struct file_t *file)
  +ap_status_t ap_get_fileperms(ap_fileperms_t *perm, struct ap_file_t *file)
   {
       if (file != NULL) {
           *perm = file->protection;
  @@ -117,7 +117,7 @@
   }
   */
   
  -ap_status_t ap_get_filedata(void **data, char *key, struct file_t *file)
  +ap_status_t ap_get_filedata(void **data, char *key, struct ap_file_t *file)
   {    
       if (file != NULL) {
           return ap_get_userdata(data, key, file->cntxt);
  @@ -128,7 +128,7 @@
       }
   }
                      
  -ap_status_t ap_set_filedata(struct file_t *file, void *data, char *key,
  +ap_status_t ap_set_filedata(struct ap_file_t *file, void *data, char *key,
                               ap_status_t (*cleanup) (void *))
   {    
       if (file != NULL) {
  
  
  
  1.11      +3 -3      apache-2.0/src/lib/apr/file_io/win32/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filedup.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- filedup.c	2000/03/31 08:35:51	1.10
  +++ filedup.c	2000/04/03 17:14:09	1.11
  @@ -58,13 +58,13 @@
   #include "apr_lib.h"
   #include <string.h>
   
  -ap_status_t ap_dupfile(struct file_t **new_file, struct file_t *old_file)
  +ap_status_t ap_dupfile(struct ap_file_t **new_file, struct ap_file_t *old_file)
   {
       HANDLE hCurrentProcess = GetCurrentProcess();
   
       if ((*new_file) == NULL) {
  -        (*new_file) = (struct file_t *) ap_pcalloc(old_file->cntxt,
  -                                                   sizeof(struct file_t));
  +        (*new_file) = (struct ap_file_t *) ap_pcalloc(old_file->cntxt,
  +                                                   sizeof(struct ap_file_t));
           if ((*new_file) == NULL) {
               return APR_ENOMEM;
           }
  
  
  
  1.10      +1 -1      apache-2.0/src/lib/apr/file_io/win32/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileio.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- fileio.h	2000/03/31 08:35:51	1.9
  +++ fileio.h	2000/04/03 17:14:09	1.10
  @@ -95,7 +95,7 @@
    *           correctly when writing to a file with this flag set TRUE.
    */
   
  -struct file_t {
  +struct ap_file_t {
       ap_context_t *cntxt;
       HANDLE filehand;
       char *fname;
  
  
  
  1.9       +1 -1      apache-2.0/src/lib/apr/file_io/win32/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filestat.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- filestat.c	2000/03/31 08:35:51	1.8
  +++ filestat.c	2000/04/03 17:14:10	1.9
  @@ -99,7 +99,7 @@
       return FALSE;
   }
   
  -ap_status_t ap_getfileinfo(ap_finfo_t *finfo, struct file_t *thefile)
  +ap_status_t ap_getfileinfo(ap_finfo_t *finfo, struct ap_file_t *thefile)
   {
       /* TODO: 
        * Windows should call GetFileInformationByHandle(), which is similar 
  
  
  
  1.25      +9 -9      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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- open.c	2000/03/31 08:35:51	1.24
  +++ open.c	2000/04/03 17:14:10	1.25
  @@ -67,7 +67,7 @@
   
   ap_status_t file_cleanup(void *thefile)
   {
  -    struct file_t *file = thefile;
  +    struct ap_file_t *file = thefile;
       if (!CloseHandle(file->filehand)) {
           return GetLastError();
       }
  @@ -75,7 +75,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_open(struct file_t **dafile, const char *fname, 
  +ap_status_t ap_open(struct ap_file_t **dafile, const char *fname, 
                       ap_int32_t flag, ap_fileperms_t perm, ap_context_t *cont)
   {
       DWORD oflags = 0;
  @@ -84,7 +84,7 @@
       DWORD sharemode = FILE_SHARE_READ | FILE_SHARE_WRITE;
       ap_oslevel_e level;
   
  -    (*dafile) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
  +    (*dafile) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t));
   
       (*dafile)->cntxt = cont;
   
  @@ -170,7 +170,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_close(struct file_t *file)
  +ap_status_t ap_close(struct ap_file_t *file)
   {
       ap_status_t stat;
       if ((stat = file_cleanup(file)) == APR_SUCCESS) {
  @@ -192,7 +192,7 @@
       }
   }
   
  -ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct file_t *file)
  +ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct ap_file_t *file)
   {
       if (file == NULL) {
           return APR_ENOFILE;
  @@ -201,14 +201,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_file(struct file_t **file, ap_os_file_t *thefile, 
  +ap_status_t ap_put_os_file(struct ap_file_t **file, ap_os_file_t *thefile, 
                              ap_context_t *cont)
   {
       if ((*file) == NULL) {
           if (cont == NULL) {
               return APR_ENOCONT;
           }
  -        (*file) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
  +        (*file) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t));
           (*file)->cntxt = cont;
       }
       (*file)->filehand = *thefile;
  @@ -223,9 +223,9 @@
       return APR_SUCCESS;
   }   
   
  -ap_status_t ap_open_stderr(struct file_t **thefile, ap_context_t *cont)
  +ap_status_t ap_open_stderr(struct ap_file_t **thefile, ap_context_t *cont)
   {
  -    (*thefile) = ap_pcalloc(cont, sizeof(struct file_t));
  +    (*thefile) = ap_pcalloc(cont, sizeof(struct ap_file_t));
       if ((*thefile) == NULL) {
           return APR_ENOMEM;
       }
  
  
  
  1.9       +6 -6      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- pipe.c	2000/03/31 08:35:51	1.8
  +++ pipe.c	2000/04/03 17:14:10	1.9
  @@ -62,11 +62,11 @@
   #include <sys/types.h>
   #include <sys/stat.h>
   
  -ap_status_t ap_set_pipe_timeout(struct file_t *thepipe, ap_int32_t timeout)
  +ap_status_t ap_set_pipe_timeout(struct ap_file_t *thepipe, ap_int32_t timeout)
   {
       return APR_ENOTIMPL;
   }
  -ap_status_t ap_create_pipe(struct file_t **in, struct file_t **out, ap_context_t *cont)
  +ap_status_t ap_create_pipe(struct ap_file_t **in, struct ap_file_t **out, ap_context_t
*cont)
   {
       SECURITY_ATTRIBUTES sa;
   
  @@ -74,13 +74,13 @@
       sa.bInheritHandle = TRUE;
       sa.lpSecurityDescriptor = NULL;
   
  -    (*in) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
  -    memset(*in, '\0', sizeof(struct file_t));
  +    (*in) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t));
  +    memset(*in, '\0', sizeof(struct ap_file_t));
       (*in)->cntxt = cont;
       (*in)->fname = ap_pstrdup(cont, "PIPE");
   
  -    (*out) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
  -    memset(*out, '\0', sizeof(struct file_t));
  +    (*out) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t));
  +    memset(*out, '\0', sizeof(struct ap_file_t));
       (*out)->cntxt = cont;
       (*out)->fname = ap_pstrdup(cont, "PIPE");
   
  
  
  
  1.18      +4 -4      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- readwrite.c	2000/03/31 08:35:52	1.17
  +++ readwrite.c	2000/04/03 17:14:10	1.18
  @@ -62,7 +62,7 @@
   
   #define GetFilePointer(hfile) SetFilePointer(hfile,0,NULL, FILE_CURRENT)
   
  -ap_status_t ap_read(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
  +ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
   {
       DWORD bread;
       int lasterror;
  @@ -88,7 +88,7 @@
       return lasterror;
   }
   
  -ap_status_t ap_write(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
  +ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
   {
       DWORD bwrote;
       FILETIME atime, mtime, ctime;
  @@ -116,7 +116,7 @@
   /*
    * Too bad WriteFileGather() is not supported on 95&98 (or NT prior to SP2) 
    */
  -ap_status_t ap_writev(struct file_t *thefile, const struct iovec *vec, ap_size_t nvec,

  +ap_status_t ap_writev(struct ap_file_t *thefile, const struct iovec *vec, ap_size_t nvec,

                         ap_ssize_t *nbytes)
   {
       int i;
  @@ -249,7 +249,7 @@
       return -1;
   }
   
  -API_EXPORT(int) ap_fprintf(struct file_t *fptr, const char *format, ...)
  +API_EXPORT(int) ap_fprintf(struct ap_file_t *fptr, const char *format, ...)
   {
       int cc;
       va_list ap;
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/file_io/win32/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/seek.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- seek.c	2000/03/31 08:35:52	1.4
  +++ seek.c	2000/04/03 17:14:10	1.5
  @@ -57,7 +57,7 @@
   #include <errno.h>
   #include <string.h>
   
  -ap_status_t ap_seek(struct file_t *thefile, ap_seek_where_t where, ap_off_t *offset)
  +ap_status_t ap_seek(struct ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset)
   {
       DWORD howmove;
       DWORD rv;
  
  
  
  1.37      +1 -1      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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- apr_file_io.h	2000/04/03 16:03:16	1.36
  +++ apr_file_io.h	2000/04/03 17:14:11	1.37
  @@ -104,7 +104,7 @@
   /* should be same as whence type in lseek, POSIX defines this as int */
   typedef ap_int32_t       ap_seek_where_t;
   
  -typedef struct file_t            ap_file_t;
  +typedef struct ap_file_t            ap_file_t;
   typedef struct ap_finfo_t        ap_finfo_t;
   typedef struct dir_t             ap_dir_t;
   typedef ap_int32_t               ap_fileperms_t;
  
  
  

Mime
View raw message