From: Junio C Hamano Date: Sun, 11 Sep 2005 20:58:41 +0000 (-0700) Subject: Use int instead of socklen_t X-Git-Tag: v0.99.7~71 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7fa090844f7d1624c7d1ffc621aae6aec84a1110;p=git.git Use int instead of socklen_t This should work around the compilation problem Johannes Schindelin and others had on Mac OS/X. Quoting Linus: Any operating system where socklen_t is anything else than "int" is terminally broken. The people who introduced that typedef were confused, and I actually had to argue with them that it was fundamentally wrong: there is no other valid type than "int" that makes sense for it. Signed-off-by: Junio C Hamano --- diff --git a/daemon.c b/daemon.c index 24bac1666..5100cf2f4 100644 --- a/daemon.c +++ b/daemon.c @@ -80,11 +80,11 @@ static unsigned int children_deleted = 0; static struct child { pid_t pid; - socklen_t addrlen; + int addrlen; struct sockaddr_storage address; } live_child[MAX_CHILDREN]; -static void add_child(int idx, pid_t pid, struct sockaddr *addr, socklen_t addrlen) +static void add_child(int idx, pid_t pid, struct sockaddr *addr, int addrlen) { live_child[idx].pid = pid; live_child[idx].addrlen = addrlen; @@ -178,7 +178,7 @@ static void check_max_connections(void) } } -static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen) +static void handle(int incoming, struct sockaddr *addr, int addrlen) { pid_t pid = fork(); @@ -308,7 +308,7 @@ static int serve(int port) if (FD_ISSET(sockfd, &fds)) { struct sockaddr_storage ss; - socklen_t sslen = sizeof(ss); + int sslen = sizeof(ss); int incoming = accept(sockfd, (struct sockaddr *)&ss, &sslen); if (incoming < 0) { switch (errno) {