summaryrefslogtreecommitdiff
path: root/src/irmd/irm_flow.c
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2021-06-21 20:24:03 +0200
committerSander Vrijders <sander@ouroboros.rocks>2021-06-23 08:36:48 +0200
commit8ca960fa0274018cb4f94a1826029d74e6f762e0 (patch)
tree268ffb6b24027d65c738a8edd196a1ed52134fcc /src/irmd/irm_flow.c
parentac53f8ea09b9a24321bc2c00832ba8a117115134 (diff)
downloadouroboros-8ca960fa0274018cb4f94a1826029d74e6f762e0.tar.gz
ouroboros-8ca960fa0274018cb4f94a1826029d74e6f762e0.zip
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 <dimitri@ouroboros.rocks> Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src/irmd/irm_flow.c')
-rw-r--r--src/irmd/irm_flow.c4
1 files changed, 2 insertions, 2 deletions
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 <ouroboros/errno.h>
#include <ouroboros/logs.h>
#include <ouroboros/time_utils.h>
+#include <ouroboros/pthread.h>
#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 ||