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 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>
Erik Faye-Lund committed
Nov 4, 2010 at 02:35 UTC
c295cf06608cb07a132abef5802366522fd2f5e0
1 file changed
+3
-3
daemon.c
+3
-3
@@ -597,7 +597,7 @@ static struct child {
597
struct sockaddr_storage address;
598
} *firstborn;
599
600
-static void add_child(struct child_process *cld, struct sockaddr *addr, int addrlen)
600
+static void add_child(struct child_process *cld, struct sockaddr *addr, socklen_t addrlen)
601
{
602
struct child *newborn, **cradle;
603
@@ -654,7 +654,7 @@ static void check_dead_children(void)
654
}
655
656
static char **cld_argv;
657
-static void handle(int incoming, struct sockaddr *addr, int addrlen)
657
+static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
658
{
659
struct child_process cld = { 0 };
660
char addrbuf[300] = "REMOTE_ADDR=", portbuf[300];
@@ -910,7 +910,7 @@ static int service_loop(struct socketlist *socklist)
910
struct sockaddr_in6 sai6;
911
#endif
912
} ss;
913
- unsigned int sslen = sizeof(ss);
913
+ socklen_t sslen = sizeof(ss);
914
int incoming = accept(pfd[i].fd, &ss.sa, &sslen);
915
if (incoming < 0) {
916
switch (errno) {