]> git.sur5r.net Git - openldap/blobdiff - libraries/liblber/nt_err.c
ITS#6901 fix filter with zero-length values
[openldap] / libraries / liblber / nt_err.c
index d5280ac4d2df7c8d3162115e9e85e5cbfd00447c..407d67307eae552f2d5f271c49aeead781d66d37 100644 (file)
@@ -1,88 +1,96 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2011 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 #include "portable.h"
 
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
-#elif HAVE_WINSOCK
+#elif defined(HAVE_WINSOCK)
 #include <winsock.h>
 #endif /* HAVE_WINSOCK(2) */
 
-#undef __RETSTR
-#define __RETSTR( x ) case x: return #x;
+#define LBER_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 )
+       switch( err ) {
+               LBER_RETSTR( WSAEINTR )
+               LBER_RETSTR( WSAEBADF )
+               LBER_RETSTR( WSAEACCES )
+               LBER_RETSTR( WSAEFAULT )
+               LBER_RETSTR( WSAEINVAL )
+               LBER_RETSTR( WSAEMFILE )
+               LBER_RETSTR( WSAEWOULDBLOCK )
+               LBER_RETSTR( WSAEINPROGRESS )
+               LBER_RETSTR( WSAEALREADY )
+               LBER_RETSTR( WSAENOTSOCK )
+               LBER_RETSTR( WSAEDESTADDRREQ )
+               LBER_RETSTR( WSAEMSGSIZE )
+               LBER_RETSTR( WSAEPROTOTYPE )
+               LBER_RETSTR( WSAENOPROTOOPT )
+               LBER_RETSTR( WSAEPROTONOSUPPORT )
+               LBER_RETSTR( WSAESOCKTNOSUPPORT )
+               LBER_RETSTR( WSAEOPNOTSUPP )
+               LBER_RETSTR( WSAEPFNOSUPPORT )
+               LBER_RETSTR( WSAEAFNOSUPPORT )
+               LBER_RETSTR( WSAEADDRINUSE )
+               LBER_RETSTR( WSAEADDRNOTAVAIL )
+               LBER_RETSTR( WSAENETDOWN )
+               LBER_RETSTR( WSAENETUNREACH )
+               LBER_RETSTR( WSAENETRESET )
+               LBER_RETSTR( WSAECONNABORTED )
+               LBER_RETSTR( WSAECONNRESET )
+               LBER_RETSTR( WSAENOBUFS )
+               LBER_RETSTR( WSAEISCONN )
+               LBER_RETSTR( WSAENOTCONN )
+               LBER_RETSTR( WSAESHUTDOWN )
+               LBER_RETSTR( WSAETOOMANYREFS )
+               LBER_RETSTR( WSAETIMEDOUT )
+               LBER_RETSTR( WSAECONNREFUSED )
+               LBER_RETSTR( WSAELOOP )
+               LBER_RETSTR( WSAENAMETOOLONG )
+               LBER_RETSTR( WSAEHOSTDOWN )
+               LBER_RETSTR( WSAEHOSTUNREACH )
+               LBER_RETSTR( WSAENOTEMPTY )
+               LBER_RETSTR( WSAEPROCLIM )
+               LBER_RETSTR( WSAEUSERS )
+               LBER_RETSTR( WSAEDQUOT )
+               LBER_RETSTR( WSAESTALE )
+               LBER_RETSTR( WSAEREMOTE )
+               LBER_RETSTR( WSASYSNOTREADY )
+               LBER_RETSTR( WSAVERNOTSUPPORTED )
+               LBER_RETSTR( WSANOTINITIALISED )
+               LBER_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        
+               LBER_RETSTR( WSAENOMORE )
+               LBER_RETSTR( WSAECANCELLED )
+               LBER_RETSTR( WSAEINVALIDPROCTABLE )
+               LBER_RETSTR( WSAEINVALIDPROVIDER )
+               LBER_RETSTR( WSASYSCALLFAILURE )
+               LBER_RETSTR( WSASERVICE_NOT_FOUND )
+               LBER_RETSTR( WSATYPE_NOT_FOUND )
+               LBER_RETSTR( WSA_E_NO_MORE )
+               LBER_RETSTR( WSA_E_CANCELLED )
+               LBER_RETSTR( WSAEREFUSED )
+#endif /* HAVE_WINSOCK2        */
 
-               __RETSTR( WSAHOST_NOT_FOUND )
-               __RETSTR( WSATRY_AGAIN )
-               __RETSTR( WSANO_RECOVERY )
-               __RETSTR( WSANO_DATA )
+               LBER_RETSTR( WSAHOST_NOT_FOUND )
+               LBER_RETSTR( WSATRY_AGAIN )
+               LBER_RETSTR( WSANO_RECOVERY )
+               LBER_RETSTR( WSANO_DATA )
        }
        return "unknown WSA error";
-}
\ No newline at end of file
+}