From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 6 Aug 2018 12:09:48 +0000 (+0200)
Subject: zimport nitpick: fix printing of uint64_t
X-Git-Tag: v3.0.0~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dc38403ce91de47c8f5233dfdb42a19350538de;p=thirdparty%2Fknot-resolver.git

zimport nitpick: fix printing of uint64_t

Equality to `unsigned long` is not guaranteed, and was getting us
warnings on macos (maybe it's not equal there).
Also reduce the overlong lines.
---

diff --git a/daemon/zimport.c b/daemon/zimport.c
index 6c00dd3ed..bc28a3d8d 100644
--- a/daemon/zimport.c
+++ b/daemon/zimport.c
@@ -44,6 +44,7 @@
  * been received from network.
  */
 
+#include <inttypes.h> /* PRIu64 */
 #include <stdlib.h>
 #include <uv.h>
 #include <ucw/mempool.h>
@@ -584,7 +585,8 @@ static void zi_zone_process(uv_timer_t* handle)
 	uint64_t elapsed = kr_now() - z_import->start_timestamp;
 	elapsed = elapsed > UINT_MAX ? UINT_MAX : elapsed;
 
-	VERBOSE_MSG(NULL, "finished in %lu ms; zone: `%s`; ns: %zd; other: %zd; failed: %zd\n",
+	VERBOSE_MSG(NULL, "finished in %"PRIu64" ms; zone: `%s`; ns: %zd"
+		    "; other: %zd; failed: %zd\n",
 		    elapsed, zone_name_str, ns_imported, other_imported, failed);
 
 finish:
@@ -616,12 +618,15 @@ static int zi_record_store(zs_scanner_t *s)
 {
 	if (s->r_data_length > UINT16_MAX) {
 		/* Due to knot_rrset_add_rdata(..., const uint16_t size, ...); */
-		kr_log_error("[zscanner] line %lu: rdata is too long\n", s->line_counter);
+		kr_log_error("[zscanner] line %"PRIu64": rdata is too long\n",
+				s->line_counter);
 		return -1;
 	}
 
 	if (knot_dname_size(s->r_owner) != strlen((const char *)(s->r_owner)) + 1) {
-		kr_log_error("[zscanner] line %lu: owner name contains zero byte, skip\n", s->line_counter);
+		kr_log_error("[zscanner] line %"PRIu64
+				": owner name contains zero byte, skip\n",
+				s->line_counter);
 		return 0;
 	}
 
@@ -630,13 +635,15 @@ static int zi_record_store(zs_scanner_t *s)
 	knot_rrset_t *new_rr = knot_rrset_new(s->r_owner, s->r_type, s->r_class,
 					      &z_import->pool);
 	if (!new_rr) {
-		kr_log_error("[zscanner] line %lu: error creating rrset\n", s->line_counter);
+		kr_log_error("[zscanner] line %"PRIu64": error creating rrset\n",
+				s->line_counter);
 		return -1;
 	}
 	int res = knot_rrset_add_rdata(new_rr, s->r_data, s->r_data_length,
 				       s->r_ttl, &z_import->pool);
 	if (res != KNOT_EOK) {
-		kr_log_error("[zscanner] line %lu: error adding rdata to rrset\n", s->line_counter);
+		kr_log_error("[zscanner] line %"PRIu64": error adding rdata to rrset\n",
+				s->line_counter);
 		return -1;
 	}
 
@@ -649,7 +656,8 @@ static int zi_record_store(zs_scanner_t *s)
 	res = kr_rrkey(key, new_rr->rclass, new_rr->owner, new_rr->type,
 		       additional_key_field);
 	if (res <= 0) {
-		kr_log_error("[zscanner] line %lu: error constructing rrkey\n", s->line_counter);
+		kr_log_error("[zscanner] line %"PRIu64": error constructing rrkey\n",
+				s->line_counter);
 		return -1;
 	}
 
@@ -661,7 +669,8 @@ static int zi_record_store(zs_scanner_t *s)
 		res = map_set(&z_import->rrset_indexed, key, new_rr);
 	}
 	if (res != 0) {
-		kr_log_error("[zscanner] line %lu: error saving parsed rrset\n", s->line_counter);
+		kr_log_error("[zscanner] line %"PRIu64": error saving parsed rrset\n",
+				s->line_counter);
 		return -1;
 	}
 
@@ -682,24 +691,29 @@ static int zi_state_parsing(zs_scanner_t *s)
 				z_import->origin = knot_dname_copy(s->zone_origin,
 								  &z_import->pool);
 			} else if (!knot_dname_is_equal(z_import->origin, s->zone_origin)) {
-				kr_log_error("[zscanner] line: %lu: zone origin changed unexpectedly\n",
+				kr_log_error("[zscanner] line: %"PRIu64
+					     ": zone origin changed unexpectedly\n",
 					     s->line_counter);
 				return -1;
 			}
 			break;
 		case ZS_STATE_ERROR:
-			kr_log_error("[zscanner] line: %lu: parse error; code: %i ('%s')\n",
-				     s->line_counter, s->error.code, zs_strerror(s->error.code));
+			kr_log_error("[zscanner] line: %"PRIu64
+				     ": parse error; code: %i ('%s')\n",
+				     s->line_counter, s->error.code,
+				     zs_strerror(s->error.code));
 			return -1;
 		case ZS_STATE_INCLUDE:
-			kr_log_error("[zscanner] line: %lu: INCLUDE is not supported\n",
+			kr_log_error("[zscanner] line: %"PRIu64
+				     ": INCLUDE is not supported\n",
 				     s->line_counter);
 			return -1;
 		case ZS_STATE_EOF:
 		case ZS_STATE_STOP:
 			return (s->error.counter == 0) ? 0 : -1;
 		default:
-			kr_log_error("[zscanner] line: %lu: unexpected parse state: %i\n",
+			kr_log_error("[zscanner] line: %"PRIu64
+				     ": unexpected parse state: %i\n",
 				     s->line_counter, s->state);
 			return -1;
 		}
@@ -785,7 +799,7 @@ int zi_zone_import(struct zone_import_ctx *z_import,
 		return ret;
 	}
 
-	VERBOSE_MSG(NULL, "[zscanner] finished in %lu ms; zone file `%s`\n",
+	VERBOSE_MSG(NULL, "[zscanner] finished in %"PRIu64" ms; zone file `%s`\n",
 			    elapsed, zone_file);
 	map_walk(&z_import->rrset_indexed, zi_mapwalk_preprocess, z_import);