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/misc/unix errorcodes.c
Date Sat, 27 May 2000 21:40:18 GMT
rbb         00/05/27 14:40:18

  Modified:    src/lib/apr/dso/unix dso.c
               src/lib/apr/include apr_dso.h
               src/lib/apr/misc/unix errorcodes.c
  Log:
  Fix the dso error handling.
  
  Revision  Changes    Path
  1.14      +11 -0     apache-2.0/src/lib/apr/dso/unix/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/dso.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- dso.c	2000/05/26 16:24:07	1.13
  +++ dso.c	2000/05/27 21:40:17	1.14
  @@ -133,3 +133,14 @@
       
       return APR_SUCCESS;
   }
  +
  +char *ap_dso_error(void)
  +{
  +#if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
  +    return strerror(errno);
  +#elif defined(HAVE_DYLD)
  +    return NULL;
  +#else
  +    return dlerror();
  +#endif
  +}
  
  
  
  1.10      +2 -0      apache-2.0/src/lib/apr/include/apr_dso.h
  
  Index: apr_dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_dso.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apr_dso.h	2000/04/16 04:46:53	1.9
  +++ apr_dso.h	2000/05/27 21:40:18	1.10
  @@ -120,4 +120,6 @@
   }
   #endif
   
  +
  +char *ap_dso_error(void);
   #endif
  
  
  
  1.17      +2 -3      apache-2.0/src/lib/apr/misc/unix/errorcodes.c
  
  Index: errorcodes.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/errorcodes.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- errorcodes.c	2000/05/27 07:01:20	1.16
  +++ errorcodes.c	2000/05/27 21:40:18	1.17
  @@ -53,6 +53,7 @@
    */
   
   #include "misc.h"
  +#include "apr_dso.h"
   
   #ifdef HAVE_NETDB_H
   #include <netdb.h>
  @@ -100,10 +101,8 @@
           return "No thread key structure was provided and one was required.";
       case APR_ENOSHMAVAIL:
           return "No shared memory is currently available";
  -#ifndef WIN32
       case APR_EDSOOPEN:
  -        return dlerror();
  -#endif
  +        return ap_dso_error();
       case APR_INCHILD:
           return
   	    "Your code just forked, and you are currently executing in the "
  
  
  

Mime
View raw message