提交 c295cf06 编写于 作者: E Erik Faye-Lund 提交者: Junio C Hamano

daemon: use socklen_t

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 7fa09084, 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: NErik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 fdc12114
...@@ -597,7 +597,7 @@ static struct child { ...@@ -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) ...@@ -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) ...@@ -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) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册