httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/network_io/os2 os2nerrno.h os2calls.h
Date Mon, 09 Oct 2000 06:46:49 GMT
bjh         00/10/08 23:46:49

  Modified:    src/lib/apr/include apr_errno.h
               src/lib/apr/network_io/os2 os2calls.h
  Added:       src/lib/apr/network_io/os2 os2nerrno.h
  Log:
  Sort out OS/2 APR error handling with new canonical test macro.
  
  Revision  Changes    Path
  1.41      +5 -6      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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- apr_errno.h	2000/10/06 17:08:27	1.40
  +++ apr_errno.h	2000/10/09 06:46:48	1.41
  @@ -347,16 +347,15 @@
   #endif
   
   
  -#if defined(OS2) /* endif !defined(WIN32) && !defined(OS2) */
  +#if defined(OS2)
   
  -/*  uhhh... I dunno
  - */
   #define APR_FROM_OS_ERROR(e) (e == 0 ? APR_SUCCESS : e + APR_OS_START_SYSERR)
   #define APR_TO_OS_ERROR(e)   (e == 0 ? APR_SUCCESS : e - APR_OS_START_SYSERR)
   
  -#define apr_get_os_error()   (APR_FROM_OS_ERROR(GetLastError()))
  -#define apr_set_os_error(e)  (SetLastError(APR_TO_OS_ERROR(e)))
  -
  +#define INCL_DOSERRORS
  +#define INCL_DOS
  +#include <os2.h>
  +#include "../network_io/os2/os2nerrno.h"
   /* And this needs to be greped away for good:
    */
   #define APR_OS2_STATUS(e) (APR_FROM_OS_ERROR(e))
  
  
  
  1.4       +1 -48     apache-2.0/src/lib/apr/network_io/os2/os2calls.h
  
  Index: os2calls.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/os2calls.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- os2calls.h	2000/03/31 08:36:12	1.3
  +++ os2calls.h	2000/10/09 06:46:49	1.4
  @@ -54,6 +54,7 @@
   
   #include <sys/types.h>
   #include <sys/socket.h>
  +#include "os2nerrno.h"
   
   extern int (*apr_os2_socket)(int, int, int);
   extern int (*apr_os2_select)(int *, int, int, int, long);
  @@ -90,51 +91,3 @@
   #define shutdown apr_os2_shutdown
   #define soclose apr_os2_soclose
   #define writev apr_os2_writev
  -
  -
  -/* Error codes returned by above calls */
  -#define SOCBASEERR              10000
  -
  -#define SOCEPERM                (SOCBASEERR+1)             /* Not owner */
  -#define SOCESRCH                (SOCBASEERR+3)             /* No such process */
  -#define SOCEINTR                (SOCBASEERR+4)             /* Interrupted system call */
  -#define SOCENXIO                (SOCBASEERR+6)             /* No such device or address
*/
  -#define SOCEBADF                (SOCBASEERR+9)             /* Bad file number */
  -#define SOCEACCES               (SOCBASEERR+13)            /* Permission denied */
  -#define SOCEFAULT               (SOCBASEERR+14)            /* Bad address */
  -#define SOCEINVAL               (SOCBASEERR+22)            /* Invalid argument */
  -#define SOCEMFILE               (SOCBASEERR+24)            /* Too many open files */
  -#define SOCEPIPE                (SOCBASEERR+32)            /* Broken pipe */
  -#define SOCEOS2ERR              (SOCBASEERR+100)           /* OS/2 Error */
  -#define SOCEWOULDBLOCK          (SOCBASEERR+35)            /* Operation would block */
  -#define SOCEINPROGRESS          (SOCBASEERR+36)            /* Operation now in progress
*/
  -#define SOCEALREADY             (SOCBASEERR+37)            /* Operation already in progress
*/
  -#define SOCENOTSOCK             (SOCBASEERR+38)            /* Socket operation on non-socket
*/
  -#define SOCEDESTADDRREQ         (SOCBASEERR+39)            /* Destination address required
*/
  -#define SOCEMSGSIZE             (SOCBASEERR+40)            /* Message too long */
  -#define SOCEPROTOTYPE           (SOCBASEERR+41)            /* Protocol wrong type for socket
*/
  -#define SOCENOPROTOOPT          (SOCBASEERR+42)            /* Protocol not available */
  -#define SOCEPROTONOSUPPORT      (SOCBASEERR+43)            /* Protocol not supported */
  -#define SOCESOCKTNOSUPPORT      (SOCBASEERR+44)            /* Socket type not supported
*/
  -#define SOCEOPNOTSUPP           (SOCBASEERR+45)            /* Operation not supported on
socket */
  -#define SOCEPFNOSUPPORT         (SOCBASEERR+46)            /* Protocol family not supported
*/
  -#define SOCEAFNOSUPPORT         (SOCBASEERR+47)            /* Address family not supported
by protocol family */
  -#define SOCEADDRINUSE           (SOCBASEERR+48)            /* Address already in use */
  -#define SOCEADDRNOTAVAIL        (SOCBASEERR+49)            /* Can't assign requested address
*/
  -#define SOCENETDOWN             (SOCBASEERR+50)            /* Network is down */
  -#define SOCENETUNREACH          (SOCBASEERR+51)            /* Network is unreachable */
  -#define SOCENETRESET            (SOCBASEERR+52)            /* Network dropped connection
on reset */
  -#define SOCECONNABORTED         (SOCBASEERR+53)            /* Software caused connection
abort */
  -#define SOCECONNRESET           (SOCBASEERR+54)            /* Connection reset by peer
*/
  -#define SOCENOBUFS              (SOCBASEERR+55)            /* No buffer space available
*/
  -#define SOCEISCONN              (SOCBASEERR+56)            /* Socket is already connected
*/
  -#define SOCENOTCONN             (SOCBASEERR+57)            /* Socket is not connected */
  -#define SOCESHUTDOWN            (SOCBASEERR+58)            /* Can't send after socket shutdown
*/
  -#define SOCETOOMANYREFS         (SOCBASEERR+59)            /* Too many references: can't
splice */
  -#define SOCETIMEDOUT            (SOCBASEERR+60)            /* Connection timed out */
  -#define SOCECONNREFUSED         (SOCBASEERR+61)            /* Connection refused */
  -#define SOCELOOP                (SOCBASEERR+62)            /* Too many levels of symbolic
links */
  -#define SOCENAMETOOLONG         (SOCBASEERR+63)            /* File name too long */
  -#define SOCEHOSTDOWN            (SOCBASEERR+64)            /* Host is down */
  -#define SOCEHOSTUNREACH         (SOCBASEERR+65)            /* No route to host */
  -#define SOCENOTEMPTY            (SOCBASEERR+66)            /* Directory not empty */
  
  
  
  1.1                  apache-2.0/src/lib/apr/network_io/os2/os2nerrno.h
  
  Index: os2nerrno.h
  ===================================================================
  #ifndef __OS2NERRNO_H
  #define __OS2NERRNO_H
  
  /* Error codes returned by above calls */
  #define SOCBASEERR              10000
  
  #define SOCEPERM                (SOCBASEERR+1)             /* Not owner */
  #define SOCESRCH                (SOCBASEERR+3)             /* No such process */
  #define SOCEINTR                (SOCBASEERR+4)             /* Interrupted system call */
  #define SOCENXIO                (SOCBASEERR+6)             /* No such device or address
*/
  #define SOCEBADF                (SOCBASEERR+9)             /* Bad file number */
  #define SOCEACCES               (SOCBASEERR+13)            /* Permission denied */
  #define SOCEFAULT               (SOCBASEERR+14)            /* Bad address */
  #define SOCEINVAL               (SOCBASEERR+22)            /* Invalid argument */
  #define SOCEMFILE               (SOCBASEERR+24)            /* Too many open files */
  #define SOCEPIPE                (SOCBASEERR+32)            /* Broken pipe */
  #define SOCEOS2ERR              (SOCBASEERR+100)           /* OS/2 Error */
  #define SOCEWOULDBLOCK          (SOCBASEERR+35)            /* Operation would block */
  #define SOCEINPROGRESS          (SOCBASEERR+36)            /* Operation now in progress
*/
  #define SOCEALREADY             (SOCBASEERR+37)            /* Operation already in progress
*/
  #define SOCENOTSOCK             (SOCBASEERR+38)            /* Socket operation on non-socket
*/
  #define SOCEDESTADDRREQ         (SOCBASEERR+39)            /* Destination address required
*/
  #define SOCEMSGSIZE             (SOCBASEERR+40)            /* Message too long */
  #define SOCEPROTOTYPE           (SOCBASEERR+41)            /* Protocol wrong type for socket
*/
  #define SOCENOPROTOOPT          (SOCBASEERR+42)            /* Protocol not available */
  #define SOCEPROTONOSUPPORT      (SOCBASEERR+43)            /* Protocol not supported */
  #define SOCESOCKTNOSUPPORT      (SOCBASEERR+44)            /* Socket type not supported
*/
  #define SOCEOPNOTSUPP           (SOCBASEERR+45)            /* Operation not supported on
socket */
  #define SOCEPFNOSUPPORT         (SOCBASEERR+46)            /* Protocol family not supported
*/
  #define SOCEAFNOSUPPORT         (SOCBASEERR+47)            /* Address family not supported
by protocol family */
  #define SOCEADDRINUSE           (SOCBASEERR+48)            /* Address already in use */
  #define SOCEADDRNOTAVAIL        (SOCBASEERR+49)            /* Can't assign requested address
*/
  #define SOCENETDOWN             (SOCBASEERR+50)            /* Network is down */
  #define SOCENETUNREACH          (SOCBASEERR+51)            /* Network is unreachable */
  #define SOCENETRESET            (SOCBASEERR+52)            /* Network dropped connection
on reset */
  #define SOCECONNABORTED         (SOCBASEERR+53)            /* Software caused connection
abort */
  #define SOCECONNRESET           (SOCBASEERR+54)            /* Connection reset by peer */
  #define SOCENOBUFS              (SOCBASEERR+55)            /* No buffer space available
*/
  #define SOCEISCONN              (SOCBASEERR+56)            /* Socket is already connected
*/
  #define SOCENOTCONN             (SOCBASEERR+57)            /* Socket is not connected */
  #define SOCESHUTDOWN            (SOCBASEERR+58)            /* Can't send after socket shutdown
*/
  #define SOCETOOMANYREFS         (SOCBASEERR+59)            /* Too many references: can't
splice */
  #define SOCETIMEDOUT            (SOCBASEERR+60)            /* Connection timed out */
  #define SOCECONNREFUSED         (SOCBASEERR+61)            /* Connection refused */
  #define SOCELOOP                (SOCBASEERR+62)            /* Too many levels of symbolic
links */
  #define SOCENAMETOOLONG         (SOCBASEERR+63)            /* File name too long */
  #define SOCEHOSTDOWN            (SOCBASEERR+64)            /* Host is down */
  #define SOCEHOSTUNREACH         (SOCBASEERR+65)            /* No route to host */
  #define SOCENOTEMPTY            (SOCBASEERR+66)            /* Directory not empty */
  
  #endif
  
  
  

Mime
View raw message