Remove _dbus_socket_is_invalid, no longer used

It didn't have many users anyway, and I've replaced them with the
DBUS_SOCKET_IS_VALID macro.

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

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 0cb1e03edd96b41aabda61082204b54f5a73817f..2e28bd86f5122fe75031e00efd4f77ff7af18d53 100644 (file)
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -606,12 +606,6 @@ _dbus_write_socket_two (DBusSocket        fd,
 #endif
 }
 
-dbus_bool_t
-_dbus_socket_is_invalid (int fd)
-{
-    return fd < 0 ? TRUE : FALSE;
-}
-
 /**
  * Thin wrapper around the read() system call that appends
  * the data it reads to the DBusString buffer. It appends

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index fee12b537a6879cb0ac3f3dc8769b01fc9a8a21d..7d48cefbc2d5141c78571df731126e636456e483 100644 (file)
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -642,12 +642,6 @@ _dbus_write_socket_two (DBusSocket        fd,
   return bytes_written;
 }
 
-dbus_bool_t
-_dbus_socket_is_invalid (DBusSocket fd)
-{
-    return fd == DBUS_SOCKET_INVALID ? TRUE : FALSE;
-}
-
 #if 0
 
 /**

diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 278cd1b45c2008b808c7645b19f6fb86743122dd..54afed124fdcb8d32bd46cb836ce60960c60625a 100644 (file)
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -209,8 +209,6 @@ int _dbus_write_socket_with_unix_fds_two (DBusSocket        fd,
                                           const int        *fds,
                                           int               n_fds);
 
-dbus_bool_t _dbus_socket_is_invalid (DBusSocket        fd);
-
 DBusSocket _dbus_connect_tcp_socket  (const char     *host,
                                       const char     *port,
                                       const char     *family,