diff options
| author | Erik Faye-Lund <kusmabite@gmail.com> | 2010-11-04 02:35:22 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-04 16:53:52 -0700 |
| commit | c295cf06608cb07a132abef5802366522fd2f5e0 (patch) | |
| tree | f2679ecebf4e8e2aed7b2092f9d044b824ff0abd /daemon.c | |
| parent | fdc12114635581b6901940ddb467a78716bc12ca (diff) | |
| download | git-c295cf06608cb07a132abef5802366522fd2f5e0.tar.gz git-c295cf06608cb07a132abef5802366522fd2f5e0.tar.xz | |
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>
Diffstat (limited to 'daemon.c')
| -rw-r--r-- | daemon.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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]; @@ -910,7 +910,7 @@ static int service_loop(struct socketlist *socklist) struct sockaddr_in6 sai6; #endif } ss; - unsigned int sslen = sizeof(ss); + socklen_t sslen = sizeof(ss); int incoming = accept(pfd[i].fd, &ss.sa, &sslen); if (incoming < 0) { switch (errno) { |