mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

daemon: use socklen_t

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Erik Faye-Lund
2010-11-04 02:35:22 +01:00
committed by Junio C Hamano
parent fdc1211463
commit c295cf0660
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemon.c
View File

@ -597,7 +597,7 @@ static struct child {
struct sockaddr_storage address; struct sockaddr_storage address;
} *firstborn; } *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; struct child *newborn, **cradle;
@ -654,7 +654,7 @@ static void check_dead_children(void)
} }
static char **cld_argv; 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 }; struct child_process cld = { 0 };
char addrbuf[300] = "REMOTE_ADDR=", portbuf[300]; char addrbuf[300] = "REMOTE_ADDR=", portbuf[300];
@ -910,7 +910,7 @@ static int service_loop(struct socketlist *socklist)
struct sockaddr_in6 sai6; struct sockaddr_in6 sai6;
#endif #endif
} ss; } ss;
unsigned int sslen = sizeof(ss); socklen_t sslen = sizeof(ss);
int incoming = accept(pfd[i].fd, &ss.sa, &sslen); int incoming = accept(pfd[i].fd, &ss.sa, &sslen);
if (incoming < 0) { if (incoming < 0) {
switch (errno) { switch (errno) {