undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use int instead of socklen_t

Browse Source 
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 <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-09-11 13:58:41 -07:00
parent 65a9289d7e
commit 7fa090844f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon.c
View File

@ -80,11 +80,11 @@ static unsigned int children_deleted = 0;
static struct child { static struct child {
pid_t pid; pid_t pid;
socklen_t addrlen; int addrlen;
struct sockaddr_storage address; struct sockaddr_storage address;
} live_child[MAX_CHILDREN]; } 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].pid = pid;
live_child[idx].addrlen = addrlen; 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(); pid_t pid = fork();
@ -308,7 +308,7 @@ static int serve(int port)
if (FD_ISSET(sockfd, &fds)) { if (FD_ISSET(sockfd, &fds)) {
struct sockaddr_storage ss; struct sockaddr_storage ss;
socklen_t sslen = sizeof(ss); int sslen = sizeof(ss);
int incoming = accept(sockfd, (struct sockaddr *)&ss, &sslen); int incoming = accept(sockfd, (struct sockaddr *)&ss, &sslen);
if (incoming < 0) { if (incoming < 0) {
switch (errno) { switch (errno) {