From c4f2e47fea665cb4679c6dfb6b1cf7eaecefbf7b Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 24 Nov 2017 10:25:37 +1100 Subject: [PATCH] silence %lu vs size_t warning by casting to (unsigned long) (cherry picked from commit 1dc8208a89d9fc4ca5e97addb2bd76c1b9c48ea1) --- lib/dns/tests/nsec3_test.c | 6 +++--- lib/dns/tests/rdata_test.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/dns/tests/nsec3_test.c b/lib/dns/tests/nsec3_test.c index 0c8c17d8cf..a91805863a 100644 --- a/lib/dns/tests/nsec3_test.c +++ b/lib/dns/tests/nsec3_test.c @@ -112,19 +112,19 @@ nsec3param_salttotext_test(const nsec3param_salttotext_test_params_t *params) { ATF_CHECK_EQ_MSG(result, ISC_R_NOSPACE, "\"%s\": expected a %lu-byte target buffer to be " "rejected, got %s\n", - params->nsec3param_text, length - 1, + params->nsec3param_text, (unsigned long)(length - 1), isc_result_totext(result)); result = dns_nsec3param_salttotext(&nsec3param, salt, length); ATF_CHECK_EQ_MSG(result, ISC_R_NOSPACE, "\"%s\": expected a %lu-byte target buffer to be " "rejected, got %s\n", - params->nsec3param_text, length, + params->nsec3param_text, (unsigned long)length, isc_result_totext(result)); result = dns_nsec3param_salttotext(&nsec3param, salt, length + 1); ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, "\"%s\": expected a %lu-byte target buffer to be " "accepted, got %s\n", - params->nsec3param_text, length + 1, + params->nsec3param_text, (unsigned long)(length + 1), isc_result_totext(result)); } diff --git a/lib/dns/tests/rdata_test.c b/lib/dns/tests/rdata_test.c index d33611f4ea..3dc02da7d0 100644 --- a/lib/dns/tests/rdata_test.c +++ b/lib/dns/tests/rdata_test.c @@ -247,7 +247,7 @@ check_wire_ok_single(const wire_ok_t *wire_ok, dns_rdataclass_t rdclass, wire_ok->lineno, dns_test_tohex(wire_ok->data, wire_ok->len, hex, sizeof(hex)), - wire_ok->len); + (unsigned long)wire_ok->len); } else { ATF_REQUIRE_MSG(result != ISC_R_SUCCESS, "line %d: %s (%lu): " @@ -255,7 +255,7 @@ check_wire_ok_single(const wire_ok_t *wire_ok, dns_rdataclass_t rdclass, wire_ok->lineno, dns_test_tohex(wire_ok->data, wire_ok->len, hex, sizeof(hex)), - wire_ok->len); + (unsigned long)wire_ok->len); } /* * If data was parsed correctly, perform two-way conversion checks