diff options
Diffstat (limited to 'dbus/dbus-transport-socket.c')
| -rw-r--r-- | dbus/dbus-transport-socket.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c index bc4b3121..35c3cbfc 100644 --- a/dbus/dbus-transport-socket.c +++ b/dbus/dbus-transport-socket.c @@ -161,7 +161,7 @@ check_write_watch (DBusTransport *transport) _dbus_verbose ("check_write_watch(): needed = %d on connection %p watch %p fd = %" DBUS_SOCKET_FORMAT " outgoing messages exist %d\n", needed, transport->connection, socket_transport->write_watch, - DBUS_SOCKET_PRINTABLE (socket_transport->fd), + _dbus_socket_printable (socket_transport->fd), _dbus_connection_has_messages_to_send_unlocked (transport->connection)); _dbus_connection_toggle_watch_unlocked (transport->connection, @@ -178,7 +178,7 @@ check_read_watch (DBusTransport *transport) dbus_bool_t need_read_watch; _dbus_verbose ("fd = %" DBUS_SOCKET_FORMAT "\n", - DBUS_SOCKET_PRINTABLE (socket_transport->fd)); + _dbus_socket_printable (socket_transport->fd)); if (transport->connection == NULL) return; @@ -517,7 +517,7 @@ do_writing (DBusTransport *transport) #if 1 _dbus_verbose ("do_writing(), have_messages = %d, fd = %" DBUS_SOCKET_FORMAT "\n", _dbus_connection_has_messages_to_send_unlocked (transport->connection), - DBUS_SOCKET_PRINTABLE (socket_transport->fd)); + _dbus_socket_printable (socket_transport->fd)); #endif oom = FALSE; @@ -743,7 +743,7 @@ do_reading (DBusTransport *transport) int saved_errno; _dbus_verbose ("fd = %" DBUS_SOCKET_FORMAT "\n", - DBUS_SOCKET_PRINTABLE (socket_transport->fd)); + _dbus_socket_printable (socket_transport->fd)); /* No messages without authentication! */ if (!_dbus_transport_try_to_authenticate (transport)) @@ -1027,7 +1027,7 @@ socket_disconnect (DBusTransport *transport) free_watches (transport); _dbus_close_socket (socket_transport->fd, NULL); - DBUS_SOCKET_INVALIDATE (socket_transport->fd); + _dbus_socket_invalidate (&socket_transport->fd); } static dbus_bool_t @@ -1084,7 +1084,7 @@ socket_do_iteration (DBusTransport *transport, timeout_milliseconds, socket_transport->read_watch, socket_transport->write_watch, - DBUS_SOCKET_PRINTABLE (socket_transport->fd)); + _dbus_socket_printable (socket_transport->fd)); /* the passed in DO_READING/DO_WRITING flags indicate whether to * read/write messages, but regardless of those we may need to block @@ -1092,7 +1092,7 @@ socket_do_iteration (DBusTransport *transport, * we don't want to read any messages yet if not given DO_READING. */ - poll_fd.fd = DBUS_SOCKET_GET_POLLABLE (socket_transport->fd); + poll_fd.fd = _dbus_socket_get_pollable (socket_transport->fd); poll_fd.events = 0; if (_dbus_transport_try_to_authenticate (transport)) @@ -1288,14 +1288,14 @@ _dbus_transport_new_for_socket (DBusSocket fd, if (!_dbus_string_init (&socket_transport->encoded_incoming)) goto failed_1; - socket_transport->write_watch = _dbus_watch_new (DBUS_SOCKET_GET_POLLABLE (fd), + socket_transport->write_watch = _dbus_watch_new (_dbus_socket_get_pollable (fd), DBUS_WATCH_WRITABLE, FALSE, NULL, NULL, NULL); if (socket_transport->write_watch == NULL) goto failed_2; - socket_transport->read_watch = _dbus_watch_new (DBUS_SOCKET_GET_POLLABLE (fd), + socket_transport->read_watch = _dbus_watch_new (_dbus_socket_get_pollable (fd), DBUS_WATCH_READABLE, FALSE, NULL, NULL, NULL); @@ -1390,7 +1390,7 @@ _dbus_transport_new_for_tcp_socket (const char *host, goto error; fd = _dbus_connect_tcp_socket_with_nonce (host, port, family, noncefile, error); - if (!DBUS_SOCKET_IS_VALID (fd)) + if (!_dbus_socket_is_valid (fd)) { _DBUS_ASSERT_ERROR_IS_SET (error); _dbus_string_free (&address); @@ -1406,7 +1406,7 @@ _dbus_transport_new_for_tcp_socket (const char *host, { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); _dbus_close_socket (fd, NULL); - DBUS_SOCKET_INVALIDATE (fd); + _dbus_socket_invalidate (&fd); } return transport; |