diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-03-12 18:44:48 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-05-12 18:35:49 +0100 |
| commit | 54395bd5ad281c27f883b1db2849f9568ca8fdd0 (patch) | |
| tree | 94ff09b765471cc8fdcd4391ca749ea0eba17095 | |
| parent | 68d8c66680d0ab206480d499a7cc532c0678e434 (diff) | |
| download | dbus-54395bd5ad281c27f883b1db2849f9568ca8fdd0.tar.gz | |
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>
| -rw-r--r-- | dbus/dbus-sysdeps-unix.c | 6 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-win.c | 6 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.h | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index 0cb1e03e..2e28bd86 100644 --- 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 fee12b53..7d48cefb 100644 --- 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 278cd1b4..54afed12 100644 --- 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, |