From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 9 May 2007 09:04:11 +0000 (+0000)
Subject: Lint fixup. splint gets confused by getrlimit.
X-Git-Tag: release-0.3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c51399e3e906c24f34483236f5e641c8338eba2;p=thirdparty%2Funbound.git

Lint fixup. splint gets confused by getrlimit.


git-svn-id: file:///svn/unbound/trunk@299 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/Makefile.in b/Makefile.in
index 4a0971921..fd52b6631 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,7 +44,7 @@ endif
 BUILD=build/
 
 LINT=splint
-LINTFLAGS=+quiet -weak -warnposix -unrecog -Din_addr_t=uint32_t -Du_int=unsigned -Du_char=uint8_t -preproc
+LINTFLAGS=+quiet -weak -warnposix -unrecog -Din_addr_t=uint32_t -Du_int=unsigned -Du_char=uint8_t -preproc -Drlimit=rlimit64
 # compat with openssl linux edition.
 LINTFLAGS+="-DBN_ULONG=unsigned long" -Dkrb5_int32=int "-Dkrb5_ui_4=unsigned int" -DPQ_64BIT=uint64_t
 
diff --git a/daemon/unbound.c b/daemon/unbound.c
index 3c2d3f8fd..d35db0bca 100644
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -70,18 +70,18 @@ static void usage()
 static void
 checkrlimits(struct config_file* cfg)
 {
-	size_t list = ((cfg->do_ip4?1:0) + (cfg->do_ip6?1:0)) * 
+	int list = ((cfg->do_ip4?1:0) + (cfg->do_ip6?1:0)) * 
 		((cfg->do_udp?1:0) + (cfg->do_tcp?1 + TCP_ACCEPT_COUNT:0));
-	size_t ifs = (cfg->num_ifs==0?1:cfg->num_ifs);
+	size_t ifs = (size_t)(cfg->num_ifs==0?1:cfg->num_ifs);
 	size_t listen_num = list*ifs;
 	size_t outnum = cfg->outgoing_num_ports*ifs + cfg->outgoing_num_tcp;
 	size_t misc = 4; /* logfile, pidfile, stdout... */
 	size_t perthread = listen_num + outnum + 2/*cmdpipe*/ + 2/*libevent*/
 		+ misc; 
 #if !defined(HAVE_PTHREAD) && !defined(HAVE_SOLARIS_THREADS)
-	size_t numthread = 1; /* it forks */
+	int numthread = 1; /* it forks */
 #else
-	size_t numthread = cfg->num_threads;
+	int numthread = cfg->num_threads;
 #endif
 	size_t total = numthread * perthread + misc;
 	struct rlimit rlim;