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/irm_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/irmd/irm_flow.c') diff --git a/src/irmd/irm_flow.c b/src/irmd/irm_flow.c index 92bf74ef..75df7a80 100644 --- a/src/irmd/irm_flow.c +++ b/src/irmd/irm_flow.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "irm_flow.h" @@ -195,8 +196,7 @@ int irm_flow_wait_state(struct irm_flow * f, assert(f->state != FLOW_NULL); - pthread_cleanup_push((void *)(void *) pthread_mutex_unlock, - &f->state_lock); + pthread_cleanup_push(__cleanup_mutex_unlock, &f->state_lock); while (!(f->state == state || f->state == FLOW_DESTROY || -- cgit v1.2.3