THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

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>
tags/v1.7.4-rc0
Erik Faye-Lund Junio C Hamano 9 years ago
parent
commit
c295cf0660
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      daemon.c

+ 3
- 3
daemon.c View File

@@ -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) {


Loading…
Cancel
Save