From 80cfa9c5d8a8b8d37a11d1c243d13788cceb87a9 Mon Sep 17 00:00:00 2001 From: Tim Cava Date: Sun, 14 Jul 2013 03:18:47 +0000 Subject: [PATCH] Make the namelen passed to getpeername() a socklen_t everywhere. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@279 13b04d17-f746-0410-82c6-800466cd88b0 --- source/dcc.c | 4 ++-- source/misc.c | 2 +- source/server.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/dcc.c b/source/dcc.c index e1d56e1..d1a27ea 100644 --- a/source/dcc.c +++ b/source/dcc.c @@ -535,7 +535,7 @@ DCC_List *new_i; SocketList *s = NULL; int new_s; struct sockaddr_in remaddr; - int rl = sizeof(remaddr); + socklen_t rl = sizeof(remaddr); if (!new_i && !(new_i = find_dcc_pending(nick, filename, NULL, type, 1, -1))) @@ -3784,7 +3784,7 @@ int i = 0; if (s->flags & DCC_WAIT) { struct sockaddr_in remaddr; - int rl = sizeof(remaddr); + socklen_t rl = sizeof(remaddr); /* maybe we should login here. */ if (getpeername(snum, (struct sockaddr *) &remaddr, &rl) != -1) diff --git a/source/misc.c b/source/misc.c index 5ad8f9a..fd4c47a 100644 --- a/source/misc.c +++ b/source/misc.c @@ -3794,7 +3794,7 @@ struct servent *serv; struct sockaddr_foobar addr; struct hostent *host; char buf[128], *hostname = buf; - int address_len; + socklen_t address_len; address_len = sizeof(struct sockaddr_foobar); if ((getpeername(rc, (struct sockaddr *) &addr, &address_len)) != -1) diff --git a/source/server.c b/source/server.c index 513e636..1a63963 100644 --- a/source/server.c +++ b/source/server.c @@ -472,7 +472,7 @@ static time_t last_timeout = 0; if (((des = server_list[i].write) > -1) && FD_ISSET(des, wr) && !(server_list[i].login_flags & LOGGED_IN)) { struct sockaddr_in sa; - int salen = sizeof(struct sockaddr_in); + socklen_t salen = sizeof(struct sockaddr_in); if (getpeername(des, (struct sockaddr *) &sa, &salen) != -1) {