mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Replace custom isc_u?intNN_t types with C99 u?intNN_t types

Browse Source
This commit is contained in:
Ondřej Surý
2018-03-28 14:19:37 +02:00
parent 055278c936
commit cb6a185c69
390 changed files with 2812 additions and 2528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/dns/rdataset.c
View File

@@ -13,6 +13,7 @@
#include <config.h>
#include <inttypes.h>
#include <stdlib.h>
#include <isc/buffer.h>
@@ -48,7 +49,7 @@ dns_trust_totext(dns_trust_t trust) {
return (trustnames[trust]);
}
#define DNS_RDATASET_COUNT_UNDEFINED ISC_UINT32_MAX
#define DNS_RDATASET_COUNT_UNDEFINED UINT32_MAX
void
dns_rdataset_init(dns_rdataset_t *rdataset) {
@@ -337,7 +338,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
struct towire_sort *out = out_fixed;
dns_fixedname_t fixed;
dns_name_t *name;
isc_uint16_t offset;
uint16_t offset;
UNUSED(state);
@@ -400,7 +401,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
}
if ((shuffle || sort)) {
isc_uint32_t seed = 0;
uint32_t seed = 0;
unsigned int j;
/*
@@ -512,7 +513,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
INSIST((target->used >= rdlen.used + 2) &&
(target->used - rdlen.used - 2 < 65536));
isc_buffer_putuint16(&rdlen,
(isc_uint16_t)(target->used -
(uint16_t)(target->used -
rdlen.used - 2));
added++;
}
@@ -539,13 +540,13 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
rollback:
if (partial && result == ISC_R_NOSPACE) {
INSIST(rrbuffer.used < 65536);
dns_compress_rollback(cctx, (isc_uint16_t)rrbuffer.used);
dns_compress_rollback(cctx, (uint16_t)rrbuffer.used);
*countp += added;
*target = rrbuffer;
goto cleanup;
}
INSIST(savedbuffer.used < 65536);
dns_compress_rollback(cctx, (isc_uint16_t)savedbuffer.used);
dns_compress_rollback(cctx, (uint16_t)savedbuffer.used);
*countp = 0;
*target = savedbuffer;
@@ -730,7 +731,7 @@ dns_rdataset_trimttl(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset,
dns_rdata_rrsig_t *rrsig, isc_stdtime_t now,
isc_boolean_t acceptexpired)
{
isc_uint32_t ttl = 0;
uint32_t ttl = 0;
REQUIRE(DNS_RDATASET_VALID(rdataset));
REQUIRE(DNS_RDATASET_VALID(sigrdataset));