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/irmd/ipcp.c | |
| 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/irmd/ipcp.c')
| -rw-r--r-- | src/irmd/ipcp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/irmd/ipcp.c b/src/irmd/ipcp.c index a6b0d20a..ae5325c5 100644 --- a/src/irmd/ipcp.c +++ b/src/irmd/ipcp.c @@ -44,11 +44,6 @@ #include <sys/time.h> #include <spawn.h> -static void close_ptr(void * o) -{ - close(*(int *) o); -} - ipcp_msg_t * send_recv_ipcp_msg(pid_t pid, ipcp_msg_t * msg) { @@ -111,7 +106,7 @@ ipcp_msg_t * send_recv_ipcp_msg(pid_t pid, (void *) &tv, sizeof(tv))) log_warn("Failed to set timeout on socket."); - pthread_cleanup_push(close_ptr, (void *) &sockfd); + pthread_cleanup_push(__cleanup_close_ptr, (void *) &sockfd); ipcp_msg__pack(msg, buf); |