Mostly remove the remnants of an older socket abstraction layer

This is only used on Windows, and wasn't even a particularly abstract
abstraction.

I've removed DBUS_SOCKET_IS_INVALID in favour of DBUS_SOCKET_IS_VALID
because I prefer to avoid double-negatives.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89444
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>

diff --git a/dbus/dbus-sockets-win.h b/dbus/dbus-sockets-win.h
index 4e1ab8ca098d0c5275e306d0ea7f9a86bc2a84a7..a35d6537f597155d29974eae62c3eeae77c51b44 100644 (file)
--- a/dbus/dbus-sockets-win.h
+++ b/dbus/dbus-sockets-win.h
@@ -41,25 +41,12 @@
 #include <errno.h>
 #endif
 
-#define DBUS_SOCKET_IS_INVALID(s) ((SOCKET)(s) == INVALID_SOCKET)
 #define DBUS_SOCKET_API_RETURNS_ERROR(n) ((n) == SOCKET_ERROR)
 #define DBUS_SOCKET_SET_ERRNO() (_dbus_win_set_errno (WSAGetLastError()))
 
-#define DBUS_CLOSE_SOCKET(s) closesocket(s)
-
 #else
 
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <errno.h>
-
-#define DBUS_SOCKET_IS_INVALID(s) ((s) < 0)
-#define DBUS_SOCKET_API_RETURNS_ERROR(n) ((n) < 0)
-#define DBUS_SOCKET_SET_ERRNO()        /* empty */
-
-#define DBUS_CLOSE_SOCKET(s) close(s)
+#error "dbus-sockets-win.h should not be included on non-Windows"
 
 #endif /* !Win32 */
 

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index f3d41ebc6d91c246c740c6a7fc4273a23e9b44d3..48b28b3ae83d488e940b6453c648c8c156666a79 100644 (file)
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -1859,7 +1859,7 @@ _dbus_accept  (DBusSocket listen_fd)
  retry:
   client_fd = accept (listen_fd, NULL, NULL);
 
-  if (DBUS_SOCKET_IS_INVALID (client_fd))
+  if (!DBUS_SOCKET_IS_VALID (client_fd))
     {
       DBUS_SOCKET_SET_ERRNO ();
       if (errno == EINTR)