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 <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>

1 files changed, 7 insertions, 4 deletions

diff --git a/src/tools/ocbr/ocbr_server.c b/src/tools/ocbr/ocbr_server.c
index 7f347971..05659dc4 100644
--- a/src/tools/ocbr/ocbr_server.c
+++ b/src/tools/ocbr/ocbr_server.c
@@ -142,6 +142,11 @@ static void handle_flow(int fd)
         flow_dealloc(fd);
 }
 
+static void __cleanup_mutex_unlock(void * mutex)
+{
+        pthread_mutex_unlock((pthread_mutex_t *) mutex);
+}
+
 static void * worker(void * o)
 {
         int cli_fd;
@@ -150,8 +155,7 @@ static void * worker(void * o)
 
         while (true) {
                 pthread_mutex_lock(&fds_lock);
-                pthread_cleanup_push((void(*)(void *)) pthread_mutex_unlock,
-                                     (void *) &fds_lock);
+                pthread_cleanup_push(__cleanup_mutex_unlock, &fds_lock);
                 while (fds[fds_index] == -1)
                         pthread_cond_wait(&fds_signal, &fds_lock);
 
@@ -184,8 +188,7 @@ static void * listener(void * o)
 
         while (true) {
                 pthread_mutex_lock(&fds_lock);
-                pthread_cleanup_push((void(*)(void *)) pthread_mutex_unlock,
-                                     (void *) &fds_lock);
+                pthread_cleanup_push(__cleanup_mutex_unlock, &fds_lock);
 
                 while (fds_count == THREADS_SIZE) {
                         printf("Can't accept any more flows, waiting.\n");