From: Evan Hunt Date: Thu, 13 Mar 2014 20:30:26 +0000 (-0700) Subject: [master] silence win64 build warning X-Git-Tag: v9.10.0b2~6 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a7742a8885f0efaddd521f2e55dcb506365240d5;p=thirdparty%2Fbind9.git [master] silence win64 build warning --- diff --git a/bin/named/server.c b/bin/named/server.c index 14bbdf28c11..ed9e50e3d8d 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -9271,7 +9271,7 @@ newzone_cfgctx_destroy(void **cfgp) { static isc_result_t generate_salt(unsigned char *salt, size_t saltlen) { - int i, num_ints; + int i, n; union { unsigned char rnd[256]; isc_uint32_t rnd32[64]; @@ -9284,14 +9284,14 @@ generate_salt(unsigned char *salt, size_t saltlen) { if (saltlen > 256U) return (ISC_R_RANGE); - num_ints = (saltlen + sizeof(isc_uint32_t) - 1) / sizeof(isc_uint32_t); - for (i = 0; i < num_ints; i++) + n = (int) (saltlen + sizeof(isc_uint32_t) - 1) / sizeof(isc_uint32_t); + for (i = 0; i < n; i++) isc_random_get(&rnd.rnd32[i]); memcpy(salt, rnd.rnd, saltlen); r.base = rnd.rnd; - r.length = saltlen; + r.length = (unsigned int) saltlen; isc_buffer_init(&buf, text, sizeof(text)); result = isc_hex_totext(&r, 2, "", &buf);