From 8ca960fa0274018cb4f94a1826029d74e6f762e0 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Mon, 21 Jun 2021 20:24:03 +0200 Subject: lib, ipcpd, irmd: Wrap pthread unlocks for cleanup This add an ouroboros/pthread.h header that wraps the pthread_..._unlock() functions for cleanup using pthread_cleanup_push() as this casting is not safe (and there were definitely bad casts in the code). The close() function is now also wrapped for cleanup in ouroboros/sockets.h. This allows enabling more compiler checks. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- src/irmd/ipcp.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/irmd/ipcp.c') diff --git a/src/irmd/ipcp.c b/src/irmd/ipcp.c index a6b0d20a..ae5325c5 100644 --- a/src/irmd/ipcp.c +++ b/src/irmd/ipcp.c @@ -44,11 +44,6 @@ #include #include -static void close_ptr(void * o) -{ - close(*(int *) o); -} - ipcp_msg_t * send_recv_ipcp_msg(pid_t pid, ipcp_msg_t * msg) { @@ -111,7 +106,7 @@ ipcp_msg_t * send_recv_ipcp_msg(pid_t pid, (void *) &tv, sizeof(tv))) log_warn("Failed to set timeout on socket."); - pthread_cleanup_push(close_ptr, (void *) &sockfd); + pthread_cleanup_push(__cleanup_close_ptr, (void *) &sockfd); ipcp_msg__pack(msg, buf); -- cgit v1.2.3