diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-03-31 21:53:22 +0200 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-05-12 18:33:43 +0100 |
| commit | ede75686ff6ee7d82119a25e746ee042ceef2aeb (patch) | |
| tree | 4e12b648d1717974cb48475328f7f536b4e6d5a8 /dbus/dbus-nonce.c | |
| parent | 720e3ccb62ad93b25950a4ed82144c98e8e24db8 (diff) | |
| download | dbus-ede75686ff6ee7d82119a25e746ee042ceef2aeb.tar.gz | |
Use typedef DBusSocket for sockets fd's to avoid conversion warnings.
[smcv: remove unneeded and invalid dbus-sysdeps.h from public header;
make prototype of _dbus_socketpair() consistent; undo conversion
of getaddrinfo result from int to SOCKET; don't call
_dbus_return_val_if_fail() from internal function]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89444
Diffstat (limited to 'dbus/dbus-nonce.c')
| -rw-r--r-- | dbus/dbus-nonce.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c index c46f15ac..3f56a2f7 100644 --- a/dbus/dbus-nonce.c +++ b/dbus/dbus-nonce.c @@ -148,10 +148,10 @@ _dbus_read_nonce (const DBusString *fname, DBusString *nonce, DBusError* error) return TRUE; } -int -_dbus_accept_with_noncefile (int listen_fd, const DBusNonceFile *noncefile) +DBusSocket +_dbus_accept_with_noncefile (DBusSocket listen_fd, const DBusNonceFile *noncefile) { - int fd; + DBusSocket fd; DBusString nonce; _dbus_assert (noncefile != NULL); @@ -437,7 +437,7 @@ _dbus_noncefile_get_path (const DBusNonceFile *noncefile) * and matches the nonce from the given nonce file */ dbus_bool_t -_dbus_noncefile_check_nonce (int fd, +_dbus_noncefile_check_nonce (DBusSocket fd, const DBusNonceFile *noncefile, DBusError* error) { |