summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2015-03-12 20:44:42 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2015-05-12 18:35:56 +0100
commitf5e1c1391fa2b1af5f69208d6697b2e991867bbb (patch)
tree66099f8b33f9fde92cb12205395fc195d84c4e9c /test
parent54395bd5ad281c27f883b1db2849f9568ca8fdd0 (diff)
Turn DBusSocket into a type-safe struct, preventing inappropriate conversion
Fix the remaining platform-specific code to look at the struct's appropriate platform-specific member. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89444
Diffstat (limited to 'test')
-rw-r--r--test/fdpass.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/fdpass.c b/test/fdpass.c
index a706c927..a74ce814 100644
--- a/test/fdpass.c
+++ b/test/fdpass.c
@@ -469,7 +469,7 @@ test_too_many_split (Fixture *f,
#ifdef HAVE_UNIX_FD_PASSING
DBusMessage *outgoing;
int i;
- int left_client_socket;
+ DBusSocket left_client_socket;
char *payload;
int payload_len;
DBusString buffer;
@@ -532,7 +532,8 @@ test_too_many_split (Fixture *f,
/* This is blatant cheating, and the API documentation specifically
* tells you not use this function in this way. Never do this
* in application code. */
- if (!dbus_connection_get_socket (f->left_client_conn, &left_client_socket))
+ if (!dbus_connection_get_socket (f->left_client_conn,
+ &left_client_socket.fd))
g_error ("'unix:' DBusConnection should have had a socket");
/* Just to be sure that we're at a message boundary. */