mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 06:25:31 +00:00
Replace custom isc_u?intNN_t types with C99 u?intNN_t types
This commit is contained in:
@@ -13,8 +13,8 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <isc/buffer.h>
|
||||
#include <isc/dir.h>
|
||||
@@ -750,7 +750,7 @@ cfg_parse_percentage(cfg_parser_t *pctx, const cfg_type_t *type,
|
||||
char *endp;
|
||||
isc_result_t result;
|
||||
cfg_obj_t *obj = NULL;
|
||||
isc_uint64_t percent;
|
||||
uint64_t percent;
|
||||
|
||||
REQUIRE(pctx != NULL);
|
||||
REQUIRE(ret != NULL && *ret == NULL);
|
||||
@@ -772,7 +772,7 @@ cfg_parse_percentage(cfg_parser_t *pctx, const cfg_type_t *type,
|
||||
}
|
||||
|
||||
CHECK(cfg_create_obj(pctx, &cfg_type_percentage, &obj));
|
||||
obj->value.uint32 = (isc_uint32_t)percent;
|
||||
obj->value.uint32 = (uint32_t)percent;
|
||||
*ret = obj;
|
||||
|
||||
cleanup:
|
||||
@@ -792,7 +792,7 @@ cfg_print_percentage(cfg_printer_t *pctx, const cfg_obj_t *obj) {
|
||||
cfg_print_chars(pctx, buf, strlen(buf));
|
||||
}
|
||||
|
||||
isc_uint32_t
|
||||
uint32_t
|
||||
cfg_obj_aspercentage(const cfg_obj_t *obj) {
|
||||
REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_percentage);
|
||||
return (obj->value.uint32);
|
||||
@@ -878,7 +878,7 @@ cfg_print_fixedpoint(cfg_printer_t *pctx, const cfg_obj_t *obj) {
|
||||
cfg_print_chars(pctx, buf, strlen(buf));
|
||||
}
|
||||
|
||||
isc_uint32_t
|
||||
uint32_t
|
||||
cfg_obj_asfixedpoint(const cfg_obj_t *obj) {
|
||||
REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_fixedpoint);
|
||||
return (obj->value.uint32);
|
||||
@@ -946,7 +946,7 @@ cfg_obj_isuint32(const cfg_obj_t *obj) {
|
||||
return (ISC_TF(obj->type->rep == &cfg_rep_uint32));
|
||||
}
|
||||
|
||||
isc_uint32_t
|
||||
uint32_t
|
||||
cfg_obj_asuint32(const cfg_obj_t *obj) {
|
||||
REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_uint32);
|
||||
return (obj->value.uint32);
|
||||
@@ -967,7 +967,7 @@ cfg_obj_isuint64(const cfg_obj_t *obj) {
|
||||
return (ISC_TF(obj->type->rep == &cfg_rep_uint64));
|
||||
}
|
||||
|
||||
isc_uint64_t
|
||||
uint64_t
|
||||
cfg_obj_asuint64(const cfg_obj_t *obj) {
|
||||
REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_uint64);
|
||||
return (obj->value.uint64);
|
||||
@@ -2327,7 +2327,7 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) {
|
||||
if ((flags & CFG_ADDR_V6OK) != 0 && strlen(s) <= 127U) {
|
||||
char buf[128]; /* see lib/bind9/getaddresses.c */
|
||||
char *d; /* zone delimiter */
|
||||
isc_uint32_t zone = 0; /* scope zone ID */
|
||||
uint32_t zone = 0; /* scope zone ID */
|
||||
|
||||
strlcpy(buf, s, sizeof(buf));
|
||||
d = strchr(buf, '%');
|
||||
|
Reference in New Issue
Block a user