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/threadproc/unix procsup.c
Date Wed, 19 Apr 2000 22:32:08 GMT
rbb         00/04/19 15:32:08

  Modified:    src/lib/apr/include apr_errno.h
               src/lib/apr/network_io/unix poll.c
               src/lib/apr/shmem/unix shmem.c
               src/lib/apr/threadproc/beos procsup.c
               src/lib/apr/threadproc/unix procsup.c
  Log:
  Cleaned up the error codes a bit.  Removed codes that aren't used anywhere,
  return errno instead of new error codes where appropriate.
  
  Revision  Changes    Path
  1.25      +5 -15     apache-2.0/src/lib/apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- apr_errno.h	2000/04/19 21:17:31	1.24
  +++ apr_errno.h	2000/04/19 22:32:06	1.25
  @@ -89,6 +89,7 @@
   #define APR_ENOPOOL        (APR_OS_START_ERROR + 2)
   #define APR_ENOFILE        (APR_OS_START_ERROR + 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)
   #define APR_ENOTIME        (APR_OS_START_ERROR + 7)
   #define APR_ENODIR         (APR_OS_START_ERROR + 8)
  @@ -97,11 +98,7 @@
   #define APR_ENOSOCKET      (APR_OS_START_ERROR + 11)
   #define APR_ENOTHREAD      (APR_OS_START_ERROR + 12)
   #define APR_ENOTHDKEY      (APR_OS_START_ERROR + 13)
  -#define APR_ENOTTHREADSAFE (APR_OS_START_ERROR + 14)
  -#define APR_ESHMLOCK       (APR_OS_START_ERROR + 15)
  -#define APR_EFUNCNOTFOUND  (APR_OS_START_ERROR + 16)
  -#define APR_ENOFUNCPOINTER (APR_OS_START_ERROR + 17)
  -#define APR_ENODSOHANDLE   (APR_OS_START_ERROR + 18)
  +#define APR_ENOSHMAVAIL    (APR_OS_START_ERROR + 15)
   #define APR_EDSOOPEN       (APR_OS_START_ERROR + 19)
   #define APR_EBADARG        (APR_OS_START_ERROR + 20)
   
  @@ -113,32 +110,25 @@
   #define APR_CHILD_DONE     (APR_OS_START_STATUS + 5)
   #define APR_CHILD_NOTDONE  (APR_OS_START_STATUS + 6)
   #define APR_TIMEUP         (APR_OS_START_STATUS + 7)
  -#define APR_INVALSOCK      (APR_OS_START_STATUS + 8)
  -#define APR_ALLSTD         (APR_OS_START_STATUS + 9)
  -#define APR_STDOUT         (APR_OS_START_STATUS + 10)
  -#define APR_STDERR         (APR_OS_START_STATUS + 11)
   #define APR_BADCH          (APR_OS_START_STATUS + 12)
   #define APR_BADARG         (APR_OS_START_STATUS + 13)
   #define APR_EOF            (APR_OS_START_STATUS + 14)
   #define APR_NOTFOUND       (APR_OS_START_STATUS + 15)
  -#define APR_LESS           (APR_OS_START_STATUS + 16)
  -#define APR_EQUAL          (APR_OS_START_STATUS + 17)
  -#define APR_MORE           (APR_OS_START_STATUS + 18)
   #define APR_ANONYMOUS      (APR_OS_START_STATUS + 19)
   #define APR_FILEBASED      (APR_OS_START_STATUS + 20)
   #define APR_KEYBASED       (APR_OS_START_STATUS + 21)
   
   /* A simple value to be used to initialze a status variable. */
  -#define APR_EINIT          (APR_OS_START_STATUS + 16)  
  +#define APR_EINIT          (APR_OS_START_STATUS + 22)  
   
   /* Not implemented either because we haven't gotten to it yet, or 
    * because it is not possible to do correctly.  
    */
  -#define APR_ENOTIMPL       (APR_OS_START_STATUS + 17)
  +#define APR_ENOTIMPL       (APR_OS_START_STATUS + 23)
   
   /* Passwords do not match.
    */
  -#define APR_EMISMATCH      (APR_OS_START_STATUS + 18)
  +#define APR_EMISMATCH      (APR_OS_START_STATUS + 24)
   
   #ifdef EACCES
   #define APR_EACCES EACCES
  
  
  
  1.26      +1 -1      apache-2.0/src/lib/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- poll.c	2000/04/16 02:27:53	1.25
  +++ poll.c	2000/04/19 22:32:07	1.26
  @@ -168,7 +168,7 @@
           i++;
       }
       if (i >= aprset->curpos) {
  -        return APR_INVALSOCK;
  +        return APR_EINVALSOCK;
       } 
       (*event) = aprset->revents[i];
       return APR_SUCCESS;
  
  
  
  1.12      +1 -1      apache-2.0/src/lib/apr/shmem/unix/shmem.c
  
  Index: shmem.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/shmem.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- shmem.c	2000/04/14 15:58:42	1.11
  +++ shmem.c	2000/04/19 22:32:07	1.12
  @@ -150,7 +150,7 @@
   {
       *size = mm_available(c);
       if (*size == 0) {
  -        return APR_ESHMLOCK;
  +        return APR_ENOSHMAVAIL;
       }
       return APR_SUCCESS;
   }
  
  
  
  1.13      +3 -3      apache-2.0/src/lib/apr/threadproc/beos/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/procsup.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- procsup.c	2000/04/14 15:58:47	1.12
  +++ procsup.c	2000/04/19 22:32:08	1.13
  @@ -70,7 +70,7 @@
   
       /* close out the standard file descriptors */
       if (freopen("/dev/null", "r", stdin) == NULL) {
  -        return APR_ALLSTD;
  +        return errno;
           /* continue anyhow -- note we can't close out descriptor 0 because we
            * have nothing to replace it with, and if we didn't have a descriptor
            * 0 the next file would be created with that value ... leading to
  @@ -78,14 +78,14 @@
            */
       }
       if (freopen("/dev/null", "w", stdout) == NULL) {
  -        return APR_STDOUT;
  +        return errno;
       }
        /* We are going to reopen this again in a little while to the error
         * log file, but better to do it twice and suffer a small performance
         * hit for consistancy than not reopen it here.
         */
       if (freopen("/dev/null", "w", stderr) == NULL) {
  -        return APR_STDERR;
  +        return errno;
       }
   }
   
  
  
  
  1.17      +3 -3      apache-2.0/src/lib/apr/threadproc/unix/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- procsup.c	2000/04/14 15:58:50	1.16
  +++ procsup.c	2000/04/19 22:32:08	1.17
  @@ -97,7 +97,7 @@
   
       /* close out the standard file descriptors */
       if (freopen("/dev/null", "r", stdin) == NULL) {
  -        return APR_ALLSTD;
  +        return errno;
           /* continue anyhow -- note we can't close out descriptor 0 because we
            * have nothing to replace it with, and if we didn't have a descriptor
            * 0 the next file would be created with that value ... leading to
  @@ -105,14 +105,14 @@
            */
       }
       if (freopen("/dev/null", "w", stdout) == NULL) {
  -        return APR_STDOUT;
  +        return errno;
       }
        /* We are going to reopen this again in a little while to the error
         * log file, but better to do it twice and suffer a small performance
         * hit for consistancy than not reopen it here.
         */
       if (freopen("/dev/null", "w", stderr) == NULL) {
  -        return APR_STDERR;
  +        return errno;
       }
   
       return APR_SUCCESS;
  
  
  

Mime
View raw message