[PATCH v6 14/16] daemon: use socklen_t
- From
Erik Faye-Lund <kusmabite@gmail.com>
- Date
- Nov 3, 2010, 16:31 UTC
- Message-ID
- <1288801894-1168-15-git-send-email-kusmabite@gmail.com>
- In-Reply-To
- <1288801894-1168-1-git-send-email-kusmabite@gmail.com>
Windows's accept()-function takes the last argument as an int, but glibc takes an unsigned int. Use socklen_t to get rid of a warning. This is basically a revert of 7fa0908, but we have already been depending on socklen_t existing since June 2006 (commit 5b276ee4). I guess this means that socklen_t IS defined on OSX after all - at least in recent headers.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> --- daemon.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon.c b/daemon.c index 3d8f6e6..5b30a2e 100644 --- a/daemon.c +++ b/daemon.c @@ -597,7 +597,7 @@ static struct child { struct sockaddr_storage address; } *firstborn; -static void add_child(struct child_process *cld, struct sockaddr *addr, int addrlen) +static void add_child(struct child_process *cld, struct sockaddr *addr, socklen_t addrlen) { struct child *newborn, **cradle; @@ -654,7 +654,7 @@ static void check_dead_children(void) } static char **cld_argv; -static void handle(int incoming, struct sockaddr *addr, int addrlen) +static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen) { struct child_process cld = { 0 }; char addrbuf[300] = "REMOTE_ADDR=", portbuf[300]; @@ -904,7 +904,7 @@ static int service_loop(struct socketlist *socklist) for (i = 0; i < socklist->nr; i++) { if (pfd[i].revents & POLLIN) { struct sockaddr_storage ss; - unsigned int sslen = sizeof(ss); + socklen_t sslen = sizeof(ss); int incoming = accept(pfd[i].fd, (struct sockaddr *)&ss, &sslen); if (incoming < 0) { switch (errno) {
-- 1.7.3.2.161.gd6e00