From c4751d50ecaafaf8bf2ec26d525a7cd16777a758 Mon Sep 17 00:00:00 2001 From: Gerhard Rieger Date: Thu, 22 May 2008 20:09:48 +0200 Subject: [PATCH] corrected a few mistakes that caused compiler warnings on 64bit hosts --- CHANGES | 2 ++ VERSION | 2 +- error.c | 4 ++-- procan-cdefs.c | 2 +- xioopts.c | 8 ++++---- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 213c651..4a635b1 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,8 @@ corrections: RECVFROM addresses with FORK option hung after processing the first packet. + corrected a few mistakes that caused compiler warnings on 64bit hosts + ####################### V 1.6.0.1: new features: diff --git a/VERSION b/VERSION index 5f22ae7..475d203 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -"1.6.0.1+ip4bind+recvfromfork" +"1.6.0.1+ip4bind+recvfromfork+x64" diff --git a/error.c b/error.c index fbddb1f..a3adf6c 100644 --- a/error.c +++ b/error.c @@ -1,5 +1,5 @@ /* source: error.c */ -/* Copyright Gerhard Rieger 2001-2007 */ +/* Copyright Gerhard Rieger 2001-2008 */ /* Published under the GNU General Public License V.2, see file COPYING */ /* the logging subsystem */ @@ -100,7 +100,7 @@ void diag_set(char what, const char *arg) { sizeof(facilitynames)/sizeof(struct wordent))) == NULL) { Error1("unknown syslog facility \"%s\"", arg); } else { - diagopts.logfacility = (int)keywd->desc; + diagopts.logfacility = (int)(size_t)keywd->desc; } } openlog(diagopts.progname, LOG_PID, diagopts.logfacility); diff --git a/procan-cdefs.c b/procan-cdefs.c index 14333de..b305578 100644 --- a/procan-cdefs.c +++ b/procan-cdefs.c @@ -20,7 +20,7 @@ int procan_cdefs(FILE *outfile) { fprintf(outfile, "#define FD_SETSIZE %u\n", FD_SETSIZE); #endif #ifdef NFDBITS - fprintf(outfile, "#define NFDBITS %u\n", NFDBITS); + fprintf(outfile, "#define NFDBITS %u\n", (unsigned int)NFDBITS); #endif #ifdef O_RDONLY fprintf(outfile, "#define O_RDONLY %u\n", O_RDONLY); diff --git a/xioopts.c b/xioopts.c index 1ccdca3..d3bc636 100644 --- a/xioopts.c +++ b/xioopts.c @@ -2030,7 +2030,7 @@ int parseopts_table(const char **a, unsigned int groups, struct opt **opts, #if WITH_IP4 case TYPE_IP4NAME: { - struct sockaddr_in sa; size_t salen = sizeof(sa); + struct sockaddr_in sa; socklen_t salen = sizeof(sa); const char *ends[] = { NULL }; const char *nests[] = { "[","]", NULL }; char buff[512], *buffp=buff; size_t bufspc = sizeof(buff)-1; @@ -3515,9 +3515,9 @@ mc:ifname|ifind mc:addr */ union sockaddr_union sockaddr1; - size_t socklen1 = sizeof(sockaddr1.ip4); + socklen_t socklen1 = sizeof(sockaddr1.ip4); union sockaddr_union sockaddr2; - size_t socklen2 = sizeof(sockaddr2.ip4); + socklen_t socklen2 = sizeof(sockaddr2.ip4); /* first parameter is alway multicast address */ /*! result */ @@ -3613,7 +3613,7 @@ mc:addr { struct ipv6_mreq ip6_mreq = {{{{0}}}}; union sockaddr_union sockaddr1; - size_t socklen1 = sizeof(sockaddr1.ip6); + socklen_t socklen1 = sizeof(sockaddr1.ip6); /* always two parameters */ /* first parameter is multicast address */