diff options
| author | Dimitri Staessens <[email protected]> | 2021-06-21 20:24:03 +0200 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2021-06-23 08:36:48 +0200 |
| commit | 8ca960fa0274018cb4f94a1826029d74e6f762e0 (patch) | |
| tree | 268ffb6b24027d65c738a8edd196a1ed52134fcc /src/ipcpd/common | |
| parent | ac53f8ea09b9a24321bc2c00832ba8a117115134 (diff) | |
| download | ouroboros-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 <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>
Diffstat (limited to 'src/ipcpd/common')
| -rw-r--r-- | src/ipcpd/common/connmgr.c | 5 |
1 files changed, 2 insertions, 3 deletions
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 <ouroboros/list.h> #include <ouroboros/logs.h> #include <ouroboros/notifier.h> +#include <ouroboros/pthread.h> #include "connmgr.h" #include "ipcp.h" -#include <pthread.h> #include <string.h> #include <stdlib.h> #include <assert.h> @@ -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); |