]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
silence %lu vs size_t warning by casting to (unsigned long)
authorMark Andrews <marka@isc.org>
Thu, 23 Nov 2017 23:25:37 +0000 (10:25 +1100)
committerMark Andrews <marka@isc.org>
Thu, 23 Nov 2017 23:26:35 +0000 (10:26 +1100)
(cherry picked from commit 1dc8208a89d9fc4ca5e97addb2bd76c1b9c48ea1)

lib/dns/tests/nsec3_test.c
lib/dns/tests/rdata_test.c

index 51313c1f3448e014a061451d3f7c5b19a2cd9413..3ba48768c550ef75d34937eb2237560eb793cb81 100644 (file)
@@ -103,19 +103,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));
 }
 
index 8fabf522f3b56e413ecabe540033e19e029bce8d..7a2f87af26d413bd620dc45de67b713f66a6be4b 100644 (file)
@@ -239,7 +239,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): "
@@ -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);
        }
        /*
         * If data was parsed correctly, perform two-way conversion checks