From 69a703446b61d9e139e693dbcc22d2d80083a788 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 11 Jul 2024 11:27:00 +0900 Subject: Use socklen_t for the length of socket address. * src/assuan-defs.h (_assuan_sock_connect): Use socklen_t. (_assuan_sock_bind, _assuan_sock_get_nonce): Likewise. * src/assuan-socket.c (_assuan_sock_connect): Likewise. (_assuan_sock_bind, _assuan_sock_get_nonce, assuan_sock_connect) (assuan_sock_bind, assuan_sock_get_nonce): Likewise. * src/assuan.h.in (assuan_sock_connect, assuan_sock_bind) (assuan_sock_get_nonce): Likewise. -- GnuPG-bug-id: 5924 Signed-off-by: NIIBE Yutaka --- src/assuan-socket.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/assuan-socket.c') diff --git a/src/assuan-socket.c b/src/assuan-socket.c index d95c2e8..6b9f6ca 100644 --- a/src/assuan-socket.c +++ b/src/assuan-socket.c @@ -1089,7 +1089,7 @@ _assuan_sock_accept (assuan_context_t ctx, assuan_fd_t sockfd, int _assuan_sock_connect (assuan_context_t ctx, assuan_fd_t sockfd, - struct sockaddr *addr, int addrlen) + struct sockaddr *addr, socklen_t addrlen) { #ifdef HAVE_W32_SYSTEM if (addr->sa_family == AF_LOCAL || addr->sa_family == AF_UNIX) @@ -1260,7 +1260,7 @@ _assuan_sock_connect_byname (assuan_context_t ctx, const char *host, int _assuan_sock_bind (assuan_context_t ctx, assuan_fd_t sockfd, - struct sockaddr *addr, int addrlen) + struct sockaddr *addr, socklen_t addrlen) { int res; @@ -1427,7 +1427,7 @@ _assuan_sock_set_sockaddr_un (const char *fname, struct sockaddr *addr, int _assuan_sock_get_nonce (assuan_context_t ctx, struct sockaddr *addr, - int addrlen, assuan_sock_nonce_t *nonce) + socklen_t addrlen, assuan_sock_nonce_t *nonce) { #ifdef HAVE_W32_SYSTEM if (addr->sa_family == AF_LOCAL || addr->sa_family == AF_UNIX) @@ -1604,7 +1604,8 @@ assuan_sock_accept (assuan_fd_t sockfd, struct sockaddr *addr, } int -assuan_sock_connect (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen) +assuan_sock_connect (assuan_fd_t sockfd, struct sockaddr *addr, + socklen_t addrlen) { return _assuan_sock_connect (sock_ctx, sockfd, addr, addrlen); } @@ -1619,7 +1620,8 @@ assuan_sock_connect_byname (const char *host, unsigned short port, } int -assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen) +assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, + socklen_t addrlen) { return _assuan_sock_bind (sock_ctx, sockfd, addr, addrlen); } @@ -1632,7 +1634,7 @@ assuan_sock_set_sockaddr_un (const char *fname, struct sockaddr *addr, } int -assuan_sock_get_nonce (struct sockaddr *addr, int addrlen, +assuan_sock_get_nonce (struct sockaddr *addr, socklen_t addrlen, assuan_sock_nonce_t *nonce) { return _assuan_sock_get_nonce (sock_ctx, addr, addrlen, nonce); -- cgit v1.2.3