trawick     01/06/07 07:32:25

  Modified:    include  apr_errno.h
               misc/unix errorcodes.c
               file_io/os2 open.c
               file_io/unix open.c
               file_io/win32 open.c
  Log:
  axe APR_ENOFILE
  
  Revision  Changes    Path
  1.69      +3 -5      apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_errno.h,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- apr_errno.h	2001/06/06 16:03:07	1.68
  +++ apr_errno.h	2001/06/07 14:32:00	1.69
  @@ -165,7 +165,6 @@
    * APR_ENOPOOL      APR was not provided a pool with which to allocate memory
    * APR_EBADDATE     APR was given an invalid date 
    * APR_EINVALSOCK   APR was given an invalid socket
  - * APR_ENOFILE      APR was not given a file structure
    * APR_ENOPROC      APR was not given a process structure
    * APR_ENOTIME      APR was not given a time structure
    * APR_ENODIR       APR was not given a directory structure
  @@ -218,15 +217,15 @@
    * @param statcode The apr status code to test.
    * @deffunc int APR_STATUS_IS_status(apr_status_t statcode)
    * @tip Warning: macro implementations; the statcode argument may be
  - *      evaluated multiple times.  To test for APR_ENOFILE, always test
  - *      APR_STATUS_IS_ENOFILE(statcode) because platform-specific codes are
  + *      evaluated multiple times.  To test for APR_EOF, always test
  + *      APR_STATUS_IS_EOF(statcode) because platform-specific codes are
    *      not necessarily translated into the corresponding APR_Estatus code.
    */
   
   /* APR ERROR VALUES */
   #define APR_ENOSTAT        (APR_OS_START_ERROR + 1)
   #define APR_ENOPOOL        (APR_OS_START_ERROR + 2)
  -#define APR_ENOFILE        (APR_OS_START_ERROR + 3)
  +/* empty slot: +3 */
   #define APR_EBADDATE       (APR_OS_START_ERROR + 4)
   #define APR_EINVALSOCK     (APR_OS_START_ERROR + 5)
   #define APR_ENOPROC        (APR_OS_START_ERROR + 6)
  @@ -252,7 +251,6 @@
   /* APR ERROR VALUE TESTS */
   #define APR_STATUS_IS_ENOSTAT(s)        ((s) == APR_ENOSTAT)
   #define APR_STATUS_IS_ENOPOOL(s)        ((s) == APR_ENOPOOL)
  -#define APR_STATUS_IS_ENOFILE(s)        ((s) == APR_ENOFILE)
   #define APR_STATUS_IS_EBADDATE(s)       ((s) == APR_EBADDATE)
   #define APR_STATUS_IS_EINVALSOCK(s)     ((s) == APR_EINVALSOCK)
   #define APR_STATUS_IS_ENOPROC(s)        ((s) == APR_ENOPROC)
  
  
  
  1.40      +0 -2      apr/misc/unix/errorcodes.c
  
  Index: errorcodes.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/unix/errorcodes.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- errorcodes.c	2001/06/04 23:09:36	1.39
  +++ errorcodes.c	2001/06/07 14:32:06	1.40
  @@ -83,8 +83,6 @@
           return "An invalid date has been provided";
       case APR_EINVALSOCK:
           return "An invalid socket was returned";
  -    case APR_ENOFILE:
  -        return "No file was provided and one was required.";
       case APR_ENOPROC:
           return "No process was provided and one was required.";
       case APR_ENOTIME:
  
  
  
  1.42      +0 -4      apr/file_io/os2/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/open.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- open.c	2001/05/31 00:11:05	1.41
  +++ open.c	2001/06/07 14:32:10	1.42
  @@ -207,10 +207,6 @@
   
   apr_status_t apr_os_file_get(apr_os_file_t *thefile, apr_file_t *file)
   {
  -    if (file == NULL) {
  -        return APR_ENOFILE;
  -    }
  -
       *thefile = file->filedes;
       return APR_SUCCESS;
   }
  
  
  
  1.76      +0 -4      apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/open.c,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- open.c	2001/05/31 00:11:07	1.75
  +++ open.c	2001/06/07 14:32:15	1.76
  @@ -203,10 +203,6 @@
   
   apr_status_t apr_os_file_get(apr_os_file_t *thefile, apr_file_t *file)
   {
  -    if (file == NULL) {
  -        return APR_ENOFILE;
  -    }
  -
       *thefile = file->filedes;
       return APR_SUCCESS;
   }
  
  
  
  1.76      +0 -3      apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/open.c,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- open.c	2001/06/06 16:04:52	1.75
  +++ open.c	2001/06/07 14:32:21	1.76
  @@ -399,9 +399,6 @@
   APR_DECLARE(apr_status_t) apr_os_file_get(apr_os_file_t *thefile,
                                             apr_file_t *file)
   {
  -    if (file == NULL) {
  -        return APR_ENOFILE;
  -    }
       *thefile = file->filehand;
       return APR_SUCCESS;
   }