From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Mon, 8 Oct 2018 16:33:04 +0000 (+0000)
Subject: Please lint by using proper types
X-Git-Tag: release-1.8.2rc1~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9268f0db50aeea1cf5b9e6207808b09598a0f73a;p=thirdparty%2Funbound.git

Please lint by using proper types


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

diff --git a/iterator/iter_utils.c b/iterator/iter_utils.c
index ebdc5b7b9..cd92bf3b0 100644
--- a/iterator/iter_utils.c
+++ b/iterator/iter_utils.c
@@ -283,7 +283,7 @@ static int
 iter_fill_rtt(struct iter_env* iter_env, struct module_env* env,
 	uint8_t* name, size_t namelen, uint16_t qtype, time_t now, 
 	struct delegpt* dp, int* best_rtt, struct sock_list* blacklist,
-	int* num_suitable_results)
+	size_t* num_suitable_results)
 {
 	int got_it = 0;
 	struct delegpt_addr* a;
@@ -323,9 +323,10 @@ rtt_compare(const void* x, const void* y)
 
 /** get RTT for the Nth fastest server */
 static int
-nth_rtt(struct delegpt_addr* result_list, int num_results, int n)
+nth_rtt(struct delegpt_addr* result_list, size_t num_results, size_t n)
 {
-	int rtt_band, i;
+	int rtt_band;
+	size_t i;
 	int* rtt_list, *rtt_index;
 	
 	if(num_results < 1 || n >= num_results) {
@@ -363,8 +364,8 @@ iter_filter_order(struct iter_env* iter_env, struct module_env* env,
 	struct delegpt* dp, int* selected_rtt, int open_target, 
 	struct sock_list* blacklist, time_t prefetch)
 {
-	int got_num = 0, low_rtt = 0, swap_to_front, rtt_band = RTT_BAND,
-		num_results, nth;
+	int got_num = 0, low_rtt = 0, swap_to_front, rtt_band = RTT_BAND, nth;
+	size_t num_results;
 	struct delegpt_addr* a, *n, *prev=NULL;
 
 	/* fillup sel_rtt and find best rtt in the bunch */
diff --git a/util/config_file.h b/util/config_file.h
index 382696326..1c5197b9a 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -163,7 +163,7 @@ struct config_file {
 	 * destinations */
 	int fast_server_permil;
 	/** number of fastest server to select from */
-	int fast_server_num;
+	size_t fast_server_num;
 
 	/** automatic interface for incoming messages. Uses ipv6 remapping,
 	 * and recvmsg/sendmsg ancillary data to detect interfaces, boolean */
diff --git a/util/configparser.c b/util/configparser.c
index 31ca210a0..5bc633a2e 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -4725,7 +4725,7 @@ yyreduce:
   case 397:
 #line 1977 "./util/configparser.y" /* yacc.c:1646  */
     { 
-		OUTYY(("P(low-rtt option is depricated, use fast-server-num instead)\n"));
+		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
 #line 4732 "util/configparser.c" /* yacc.c:1646  */