diff options
| author | Dimitri Staessens <dimitri@ouroboros.rocks> | 2021-06-21 20:24:03 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander@ouroboros.rocks> | 2021-06-23 08:36:48 +0200 |
| commit | 8ca960fa0274018cb4f94a1826029d74e6f762e0 (patch) | |
| tree | 268ffb6b24027d65c738a8edd196a1ed52134fcc /src/lib/sockets.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 <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src/lib/sockets.c')
| -rw-r--r-- | src/lib/sockets.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/sockets.c b/src/lib/sockets.c index 391d41d5..8179d2b3 100644 --- a/src/lib/sockets.c +++ b/src/lib/sockets.c @@ -40,6 +40,11 @@ #define SOCK_TYPE SOCK_SEQPACKET #endif +void __cleanup_close_ptr(void * fd) +{ + close(*(int *) fd); +} + int client_socket_open(char * file_name) { int sockfd; @@ -95,11 +100,6 @@ int server_socket_open(char * file_name) return sockfd; } -static void close_ptr(void * o) -{ - close(*(int *) o); -} - irm_msg_t * send_recv_irm_msg(irm_msg_t * msg) { int sockfd; @@ -117,7 +117,7 @@ irm_msg_t * send_recv_irm_msg(irm_msg_t * msg) return NULL; } - pthread_cleanup_push(close_ptr, &sockfd); + pthread_cleanup_push(__cleanup_close_ptr, &sockfd); irm_msg__pack(msg, buf); |