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 <[email protected]>

3 files changed, 15 insertions, 12 deletions

diff --git a/src/assuan-defs.h b/src/assuan-defs.h
index 5052e8e..e7fb28b 100644
--- a/src/assuan-defs.h
+++ b/src/assuan-defs.h
@@ -391,13 +391,13 @@ ssize_t _assuan_simple_write (assuan_context_t ctx, const void *buffer,
 assuan_fd_t _assuan_sock_new (assuan_context_t ctx, int domain, int type,
 			      int proto);
 int _assuan_sock_connect (assuan_context_t ctx, assuan_fd_t sockfd,
-                          struct sockaddr *addr, int addrlen);
+                          struct sockaddr *addr, socklen_t addrlen);
 int _assuan_sock_bind (assuan_context_t ctx, assuan_fd_t sockfd,
-		       struct sockaddr *addr, int addrlen);
+		       struct sockaddr *addr, socklen_t addrlen);
 int _assuan_sock_set_sockaddr_un (const char *fname, struct sockaddr *addr,
                                   int *r_redirected);
 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);
 int _assuan_sock_check_nonce (assuan_context_t ctx, assuan_fd_t fd,
 			      assuan_sock_nonce_t *nonce);
 #ifdef HAVE_W32_SYSTEM
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);
diff --git a/src/assuan.h.in b/src/assuan.h.in
index 69e3c3b..ffeeff5 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -511,15 +511,16 @@ int assuan_sock_get_flag (assuan_fd_t sockfd, const char *name, int *r_value);
 assuan_fd_t assuan_sock_accept (assuan_fd_t sockfd,
                                 struct sockaddr *addr, socklen_t *p_addrlen);
 int assuan_sock_connect (assuan_fd_t sockfd,
-                         struct sockaddr *addr, int addrlen);
+                         struct sockaddr *addr, socklen_t addrlen);
 assuan_fd_t assuan_sock_connect_byname (const char *host, unsigned short port,
                                         int timeout,
                                         const char *credentials,
                                         unsigned int flags);
-int assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen);
+int assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr,
+                      socklen_t addrlen);
 int assuan_sock_set_sockaddr_un (const char *fname, struct sockaddr *addr,
                                  int *r_redirected);
-int assuan_sock_get_nonce (struct sockaddr *addr, int addrlen,
+int assuan_sock_get_nonce (struct sockaddr *addr, socklen_t addrlen,
                            assuan_sock_nonce_t *nonce);
 int assuan_sock_check_nonce (assuan_fd_t fd, assuan_sock_nonce_t *nonce);
 void assuan_sock_set_system_hooks (assuan_system_hooks_t system_hooks);