From: Erik Faye-Lund <kusmabite@gmail.com>
To: git@vger.kernel.org
Cc: msysgit@googlegroups.com, j6t@kdbg.org, avarab@gmail.com,
sunshine@sunshineco.com, jrnieder@gmail.com,
schwab@linux-m68k.org, patthoyts@gmail.com
Subject: [PATCH 13/15] daemon: use socklen_t
Date: Fri, 22 Oct 2010 02:05:42 +0200 [thread overview]
Message-ID: <1287705944-5668-13-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1287705944-5668-1-git-send-email-kusmabite@gmail.com>
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>
---
daemon.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon.c b/daemon.c
index 19b4eb3..af13f4a 100644
--- a/daemon.c
+++ b/daemon.c
@@ -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];
@@ -904,7 +904,7 @@ static int service_loop(struct socketlist *socklist)
for (i = 0; i < socklist->nr; i++) {
if (pfd[i].revents & POLLIN) {
struct sockaddr_storage ss;
- unsigned int sslen = sizeof(ss);
+ socklen_t sslen = sizeof(ss);
int incoming = accept(pfd[i].fd, (struct sockaddr *)&ss, &sslen);
if (incoming < 0) {
switch (errno) {
--
1.7.3.1.199.g72340
next prev parent reply other threads:[~2010-10-22 0:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-22 0:05 [PATCH 01/15] mingw: implement syslog Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 02/15] compat: add inet_pton and inet_ntop prototypes Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 03/15] inet_ntop: fix a couple of old-style decls Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 04/15] mingw: use real pid Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 05/15] mingw: support waitpid with pid > 0 and WNOHANG Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 06/15] mingw: add kill emulation Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 07/15] daemon: use run-command api for async serving Erik Faye-Lund
2010-10-22 0:10 ` Jonathan Nieder
2010-10-22 0:20 ` Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 08/15] daemon: use full buffered mode for stderr Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 09/15] Improve the mingw getaddrinfo stub to handle more use cases Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 10/15] daemon: get remote host address from root-process Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 11/15] mingw: import poll-emulation from gnulib Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 12/15] mingw: use " Erik Faye-Lund
2010-10-22 0:05 ` Erik Faye-Lund [this message]
2010-10-22 0:05 ` [PATCH 14/15] daemon: make --inetd and --detcach incompatible Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 15/15] daemon: opt-out on features that require posix Erik Faye-Lund
2010-10-22 0:13 ` [PATCH 01/15] mingw: implement syslog Erik Faye-Lund
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1287705944-5668-13-git-send-email-kusmabite@gmail.com \
--to=kusmabite@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=msysgit@googlegroups.com \
--cc=patthoyts@gmail.com \
--cc=schwab@linux-m68k.org \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).