Skip to content

Commit

Permalink
Use int instead of socklen_t
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Sep 12, 2005
1 parent 65a9289 commit 7fa0908
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions daemon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 7fa0908

Please sign in to comment.