From 5029a13283d5b9d4ec25302a9c3841e426dcb3c0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 19 Jan 2011 14:11:48 -0500 Subject: [PATCH] Put the fd in the closure so debugging can print it --- wayland/connection.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wayland/connection.c b/wayland/connection.c index 0705c19..73715e2 100644 --- a/wayland/connection.c +++ b/wayland/connection.c @@ -369,7 +369,7 @@ wl_connection_vmarshal(struct wl_connection *connection, struct wl_array **arrayp, *array; const char **sp, *s; char *extra; - int i, count, fd, extra_size; + int i, count, fd, extra_size, *fd_ptr; extra_size = wl_message_size_extra(message); count = strlen(message->signature) + 2; @@ -449,12 +449,18 @@ wl_connection_vmarshal(struct wl_connection *connection, break; case 'h': + closure->types[i] = &ffi_type_sint; + closure->args[i] = extra; + fd_ptr = (int *) extra; + extra += sizeof *fd_ptr; + fd = va_arg(ap, int); dup_fd = dup(fd); if (dup_fd < 0) { fprintf(stderr, "dup failed: %m"); abort(); } + *fd_ptr = dup_fd; wl_buffer_put(&connection->fds_out, &dup_fd, sizeof dup_fd); break; -- 2.7.4