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/ipcpd/common/connmgr.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/ipcpd/common/connmgr.c') diff --git a/src/ipcpd/common/connmgr.c b/src/ipcpd/common/connmgr.c index 9002467c..53a66992 100644 --- a/src/ipcpd/common/connmgr.c +++ b/src/ipcpd/common/connmgr.c @@ -28,11 +28,11 @@ #include #include #include +#include #include "connmgr.h" #include "ipcp.h" -#include #include #include #include @@ -493,8 +493,7 @@ int connmgr_wait(enum comp_id id, pthread_mutex_lock(&comp->lock); - pthread_cleanup_push((void(*)(void *))pthread_mutex_unlock, - (void *) &comp->lock); + pthread_cleanup_push(__cleanup_mutex_unlock, &comp->lock); while (list_is_empty(&comp->pending)) pthread_cond_wait(&comp->cond, &comp->lock); -- cgit v1.2.3