From 8b4d139873acfb3351ad335830b2689720d21552 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Sat, 29 Aug 2020 20:31:51 +0200 Subject: libseat: Improve logging with seatd conn helpers Add helpers around connection access to have all logging centralized and reduce code duplication. Improve existing helpers to further reduce code duplication. The seatd backend should have much better logging after this. --- common/connection.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'common') diff --git a/common/connection.c b/common/connection.c index a6739c0..6b2c366 100644 --- a/common/connection.c +++ b/common/connection.c @@ -284,15 +284,14 @@ int connection_get(struct connection *connection, void *dst, size_t count) { return count; } -int connection_get_fd(struct connection *connection) { - int fd; - if (sizeof fd > connection_buffer_size(&connection->fds_in)) { +int connection_get_fd(struct connection *connection, int *fd) { + if (sizeof(int) > connection_buffer_size(&connection->fds_in)) { errno = EAGAIN; return -1; } - connection_buffer_copy(&connection->fds_in, &fd, sizeof fd); - connection_buffer_consume(&connection->fds_in, sizeof fd); - return fd; + connection_buffer_copy(&connection->fds_in, fd, sizeof(int)); + connection_buffer_consume(&connection->fds_in, sizeof(int)); + return 0; } void connection_close_fds(struct connection *connection) { -- cgit v1.2.3