From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Thu, 21 Sep 2017 09:21:55 +0000 (+0200)
Subject: nitpick: unsigned vs. long makes a difference in printf
X-Git-Tag: v1.4.0~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9554a3723e210ac898f4a3e88886df1bb558ed5;p=thirdparty%2Fknot-resolver.git

nitpick: unsigned vs. long makes a difference in printf

Sometimes I was getting huge RTT numbers in the output (>4G).
---

diff --git a/lib/resolve.c b/lib/resolve.c
index 30f264b95..4bd652081 100644
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -792,7 +792,7 @@ static void update_nslist_rtt(struct kr_context *ctx, struct kr_query *qry, cons
 	/* Calculate total resolution time from the time the query was generated. */
 	struct timeval now;
 	gettimeofday(&now, NULL);
-	unsigned elapsed = time_diff(&qry->timestamp, &now);
+	long elapsed = time_diff(&qry->timestamp, &now);
 
 	/* NSs in the preference list prior to the one who responded will be penalised
 	 * with the RETRY timer interval. This is because we know they didn't respond
@@ -823,7 +823,7 @@ static void update_nslist_rtt(struct kr_context *ctx, struct kr_query *qry, cons
 			 WITH_VERBOSE {
 			 	char addr_str[INET6_ADDRSTRLEN];
 			 	inet_ntop(addr->sa_family, kr_inaddr(addr), addr_str, sizeof(addr_str));
-			 	VERBOSE_MSG(qry, "<= server: '%s' rtt: >=%ld ms\n", addr_str, elapsed);
+				VERBOSE_MSG(qry, "<= server: '%s' rtt: >=%ld ms\n", addr_str, elapsed);
 			 }
 		}
 		/* Subtract query start time from elapsed time */
@@ -862,7 +862,7 @@ static void update_nslist_score(struct kr_request *request, struct kr_query *qry
 
 bool check_resolution_time(struct kr_query *qry, struct timeval *now)
 {
-	unsigned resolving_time = time_diff(&qry->creation_time, now);
+	long resolving_time = time_diff(&qry->creation_time, now);
 	if (resolving_time > KR_RESOLVE_TIME_LIMIT) {
 		WITH_VERBOSE {
 			VERBOSE_MSG(qry, "query resolution time limit exceeded\n");