From: Howard Chu Date: Fri, 12 May 2000 21:16:15 +0000 (+0000) Subject: Moved nt_err from liblutil to liblber, renamed WSAGetErrorString to X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2993 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3dc83998c0f4c58d4683dab316d72a2efcf0a58f;p=openldap Moved nt_err from liblutil to liblber, renamed WSAGetErrorString to ber_pvt_wsa_err2string. --- diff --git a/include/ac/socket.h b/include/ac/socket.h index 5e20569f54..c1a00456bf 100644 --- a/include/ac/socket.h +++ b/include/ac/socket.h @@ -90,9 +90,9 @@ #undef sock_errno #undef sock_errstr #define sock_errno() WSAGetLastError() -#define sock_errstr(e) WSAGetErrorString(e) +#define sock_errstr(e) ber_pvt_wsa_err2string(e) -LIBLUTIL_F (char *) WSAGetErrorString LDAP_P((int)); +LIBLBER_F (char *) ber_pvt_wsa_err2string LDAP_P((int)); #elif MACOS # define tcp_close( s ) tcpclose( s ) diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in index 227509f974..3c087ae1f5 100644 --- a/libraries/liblber/Makefile.in +++ b/libraries/liblber/Makefile.in @@ -8,10 +8,13 @@ LIBRARY = liblber.la XLIBRARY = ../liblber.a +NT_SRCS = nt_err.c +NT_OBJS = nt_err.lo + SRCS= assert.c decode.c encode.c io.c bprint.c \ - memory.c options.c sockbuf.c + memory.c options.c sockbuf.c $(@PLAT@_SRCS) OBJS= assert.lo decode.lo encode.lo io.lo bprint.lo \ - memory.lo options.lo sockbuf.lo + memory.lo options.lo sockbuf.lo $(@PLAT@_OBJS) XSRCS= version.c PROGRAMS= dtest etest idtest diff --git a/libraries/liblber/nt_err.c b/libraries/liblber/nt_err.c new file mode 100644 index 0000000000..adb7b97334 --- /dev/null +++ b/libraries/liblber/nt_err.c @@ -0,0 +1,112 @@ +/* $OpenLDAP$ */ +#include "portable.h" + +#include + +#ifdef HAVE_WINSOCK2 +#include +#elif HAVE_WINSOCK +#include +#endif /* HAVE_WINSOCK(2) */ + +#define __RETSTR( x ) case x: return #x; + +char *ber_pvt_wsa_err2string( int err ) +{ + switch( err ) + { + __RETSTR( WSAEINTR ) + __RETSTR( WSAEBADF ) + __RETSTR( WSAEACCES ) + __RETSTR( WSAEFAULT ) + __RETSTR( WSAEINVAL ) + __RETSTR( WSAEMFILE ) + __RETSTR( WSAEWOULDBLOCK ) + __RETSTR( WSAEINPROGRESS ) + __RETSTR( WSAEALREADY ) + __RETSTR( WSAENOTSOCK ) + __RETSTR( WSAEDESTADDRREQ ) + __RETSTR( WSAEMSGSIZE ) + __RETSTR( WSAEPROTOTYPE ) + __RETSTR( WSAENOPROTOOPT ) + __RETSTR( WSAEPROTONOSUPPORT ) + __RETSTR( WSAESOCKTNOSUPPORT ) + __RETSTR( WSAEOPNOTSUPP ) + __RETSTR( WSAEPFNOSUPPORT ) + __RETSTR( WSAEAFNOSUPPORT ) + __RETSTR( WSAEADDRINUSE ) + __RETSTR( WSAEADDRNOTAVAIL ) + __RETSTR( WSAENETDOWN ) + __RETSTR( WSAENETUNREACH ) + __RETSTR( WSAENETRESET ) + __RETSTR( WSAECONNABORTED ) + __RETSTR( WSAECONNRESET ) + __RETSTR( WSAENOBUFS ) + __RETSTR( WSAEISCONN ) + __RETSTR( WSAENOTCONN ) + __RETSTR( WSAESHUTDOWN ) + __RETSTR( WSAETOOMANYREFS ) + __RETSTR( WSAETIMEDOUT ) + __RETSTR( WSAECONNREFUSED ) + __RETSTR( WSAELOOP ) + __RETSTR( WSAENAMETOOLONG ) + __RETSTR( WSAEHOSTDOWN ) + __RETSTR( WSAEHOSTUNREACH ) + __RETSTR( WSAENOTEMPTY ) + __RETSTR( WSAEPROCLIM ) + __RETSTR( WSAEUSERS ) + __RETSTR( WSAEDQUOT ) + __RETSTR( WSAESTALE ) + __RETSTR( WSAEREMOTE ) + __RETSTR( WSASYSNOTREADY ) + __RETSTR( WSAVERNOTSUPPORTED ) + __RETSTR( WSANOTINITIALISED ) + __RETSTR( WSAEDISCON ) + +#ifdef HAVE_WINSOCK2 + __RETSTR( WSAENOMORE ) + __RETSTR( WSAECANCELLED ) + __RETSTR( WSAEINVALIDPROCTABLE ) + __RETSTR( WSAEINVALIDPROVIDER ) + __RETSTR( WSASYSCALLFAILURE ) + __RETSTR( WSASERVICE_NOT_FOUND ) + __RETSTR( WSATYPE_NOT_FOUND ) + __RETSTR( WSA_E_NO_MORE ) + __RETSTR( WSA_E_CANCELLED ) + __RETSTR( WSAEREFUSED ) +#endif // HAVE_WINSOCK2 + + __RETSTR( WSAHOST_NOT_FOUND ) + __RETSTR( WSATRY_AGAIN ) + __RETSTR( WSANO_RECOVERY ) + __RETSTR( WSANO_DATA ) + } + return "unknown"; +} + +#undef __RETSTR + +#if 0 /* No one seems to be using these */ +char *ber_pvt_wsa_last_errstring( void ) +{ + return ber_pvt_wsa_err2string( WSAGetLastError() ); +} + +char *GetErrorString( int err ) +{ + static char msgBuf[1024]; + + FormatMessage( + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + msgBuf, 1024, NULL ); + + return msgBuf; +} + +char *GetLastErrorString( void ) +{ + return GetErrorString( GetLastError() ); +} +#endif diff --git a/libraries/liblutil/Makefile.in b/libraries/liblutil/Makefile.in index 8aec16995f..07cadf5838 100644 --- a/libraries/liblutil/Makefile.in +++ b/libraries/liblutil/Makefile.in @@ -5,8 +5,8 @@ LIBRARY = liblutil.a -NT_SRCS = nt_err.c ntservice.c -NT_OBJS = nt_err.o ntservice.o slapdmsg.res +NT_SRCS = ntservice.c +NT_OBJS = ntservice.o slapdmsg.res UNIX_SRCS = detach.c UNIX_OBJS = detach.o diff --git a/libraries/liblutil/nt_err.c b/libraries/liblutil/nt_err.c deleted file mode 100644 index 691c19caa6..0000000000 --- a/libraries/liblutil/nt_err.c +++ /dev/null @@ -1,113 +0,0 @@ -/* $OpenLDAP$ */ -#include "portable.h" - -#include - -#ifdef HAVE_WINSOCK2 -#include -#elif HAVE_WINSOCK -#include -#endif /* HAVE_WINSOCK(2) */ - -#define __RETSTR( x ) case x: return #x; - -char *WSAGetErrorString( int err ) -{ - switch( err ) - { - __RETSTR( WSAEINTR ) - __RETSTR( WSAEBADF ) - __RETSTR( WSAEACCES ) - __RETSTR( WSAEFAULT ) - __RETSTR( WSAEINVAL ) - __RETSTR( WSAEMFILE ) - __RETSTR( WSAEWOULDBLOCK ) - __RETSTR( WSAEINPROGRESS ) - __RETSTR( WSAEALREADY ) - __RETSTR( WSAENOTSOCK ) - __RETSTR( WSAEDESTADDRREQ ) - __RETSTR( WSAEMSGSIZE ) - __RETSTR( WSAEPROTOTYPE ) - __RETSTR( WSAENOPROTOOPT ) - __RETSTR( WSAEPROTONOSUPPORT ) - __RETSTR( WSAESOCKTNOSUPPORT ) - __RETSTR( WSAEOPNOTSUPP ) - __RETSTR( WSAEPFNOSUPPORT ) - __RETSTR( WSAEAFNOSUPPORT ) - __RETSTR( WSAEADDRINUSE ) - __RETSTR( WSAEADDRNOTAVAIL ) - __RETSTR( WSAENETDOWN ) - __RETSTR( WSAENETUNREACH ) - __RETSTR( WSAENETRESET ) - __RETSTR( WSAECONNABORTED ) - __RETSTR( WSAECONNRESET ) - __RETSTR( WSAENOBUFS ) - __RETSTR( WSAEISCONN ) - __RETSTR( WSAENOTCONN ) - __RETSTR( WSAESHUTDOWN ) - __RETSTR( WSAETOOMANYREFS ) - __RETSTR( WSAETIMEDOUT ) - __RETSTR( WSAECONNREFUSED ) - __RETSTR( WSAELOOP ) - __RETSTR( WSAENAMETOOLONG ) - __RETSTR( WSAEHOSTDOWN ) - __RETSTR( WSAEHOSTUNREACH ) - __RETSTR( WSAENOTEMPTY ) - __RETSTR( WSAEPROCLIM ) - __RETSTR( WSAEUSERS ) - __RETSTR( WSAEDQUOT ) - __RETSTR( WSAESTALE ) - __RETSTR( WSAEREMOTE ) - __RETSTR( WSASYSNOTREADY ) - __RETSTR( WSAVERNOTSUPPORTED ) - __RETSTR( WSANOTINITIALISED ) - __RETSTR( WSAEDISCON ) - -#ifdef HAVE_WINSOCK2 - __RETSTR( WSAENOMORE ) - __RETSTR( WSAECANCELLED ) - __RETSTR( WSAEINVALIDPROCTABLE ) - __RETSTR( WSAEINVALIDPROVIDER ) - __RETSTR( WSASYSCALLFAILURE ) - __RETSTR( WSASERVICE_NOT_FOUND ) - __RETSTR( WSATYPE_NOT_FOUND ) - __RETSTR( WSA_E_NO_MORE ) - __RETSTR( WSA_E_CANCELLED ) - __RETSTR( WSAEREFUSED ) -#endif // HAVE_WINSOCK2 - - __RETSTR( WSAHOST_NOT_FOUND ) - __RETSTR( WSATRY_AGAIN ) - __RETSTR( WSANO_RECOVERY ) - __RETSTR( WSANO_DATA ) - } - return "unknown"; -} - -char *WSAGetLastErrorString( void ) -{ - return WSAGetErrorString( WSAGetLastError() ); -} - -#undef __RETSTR - -char *GetErrorString( int err ) -{ - static char msgBuf[1024]; - - FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - msgBuf, 1024, NULL ); - - return msgBuf; -} - -char *GetLastErrorString( void ) -{ - return GetErrorString( GetLastError() ); -} - - -