mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Merge branch '2993-replace-instances-of-arraysize-with-array_size' into 'main'

Browse Source 
Resolve "Replace instances of ARRAYSIZE with ARRAY_SIZE"

Closes #2993

See merge request isc-projects/bind9!5551
This commit is contained in:
Mark Andrews
2021-11-02 10:57:45 +00:00
parent a174dfb462 22662fc28e
commit d051de17de
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/named/server.c
View File

@@ -152,10 +152,6 @@
#define SIZE_AS_PERCENT ((size_t)-2) #define SIZE_AS_PERCENT ((size_t)-2)
#endif /* ifndef SIZE_AS_PERCENT */ #endif /* ifndef SIZE_AS_PERCENT */
#ifndef ARRAYSIZE
#define ARRAYSIZE(x) (sizeof(x) / sizeof(x[0]))
#endif
#ifdef TUNE_LARGE #ifdef TUNE_LARGE
#define RESOLVER_NTASKS_PERCPU 32 #define RESOLVER_NTASKS_PERCPU 32
#else #else
@@ -5829,7 +5825,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
} }
name = dns_fixedname_initname(&fixed); name = dns_fixedname_initname(&fixed);
for (ipv4only_zone = 0; ipv4only_zone < ARRAYSIZE(zones); for (ipv4only_zone = 0; ipv4only_zone < ARRAY_SIZE(zones);
ipv4only_zone++) { ipv4only_zone++) {
dns_forwarders_t *dnsforwarders = NULL; dns_forwarders_t *dnsforwarders = NULL;

13
lib/dns/rdata/in_1/svcb_64.c
View File

@@ -90,12 +90,7 @@ static isc_result_t
svcb_validate(uint16_t key, isc_region_t *region) { svcb_validate(uint16_t key, isc_region_t *region) {
size_t i; size_t i;
#ifndef ARRAYSIZE for (i = 0; i < ARRAY_SIZE(sbpr); i++) {
/* defined in winnt.h */
#define ARRAYSIZE(x) (sizeof(x) / sizeof(*x))
#endif
for (i = 0; i < ARRAYSIZE(sbpr); i++) {
if (sbpr[i].value == key) { if (sbpr[i].value == key) {
switch (sbpr[i].encoding) { switch (sbpr[i].encoding) {
case sbpr_port: case sbpr_port:
@@ -172,7 +167,7 @@ svc_keyfromregion(isc_textregion_t *region, char sep, uint16_t *value,
unsigned long ul; unsigned long ul;
/* Look for known key names. */ /* Look for known key names. */
for (i = 0; i < ARRAYSIZE(sbpr); i++) { for (i = 0; i < ARRAY_SIZE(sbpr); i++) {
size_t len = strlen(sbpr[i].name); size_t len = strlen(sbpr[i].name);
if (strncasecmp(region->base, sbpr[i].name, len) != 0 || if (strncasecmp(region->base, sbpr[i].name, len) != 0 ||
(region->base[len] != 0 && region->base[len] != sep)) (region->base[len] != 0 && region->base[len] != sep))
@@ -235,7 +230,7 @@ svc_fromtext(isc_textregion_t *region, isc_buffer_t *target) {
unsigned int used; unsigned int used;
unsigned long ul; unsigned long ul;
for (i = 0; i < ARRAYSIZE(sbpr); i++) { for (i = 0; i < ARRAY_SIZE(sbpr); i++) {
len = strlen(sbpr[i].name); len = strlen(sbpr[i].name);
if (strncmp(region->base, sbpr[i].name, len) != 0 || if (strncmp(region->base, sbpr[i].name, len) != 0 ||
(region->base[len] != 0 && region->base[len] != '=')) (region->base[len] != 0 && region->base[len] != '='))
@@ -360,7 +355,7 @@ svcparamkey(unsigned short value, enum encoding *encoding, char *buf,
size_t i; size_t i;
int n; int n;
for (i = 0; i < ARRAYSIZE(sbpr); i++) { for (i = 0; i < ARRAY_SIZE(sbpr); i++) {
if (sbpr[i].value == value && sbpr[i].initial) { if (sbpr[i].value == value && sbpr[i].initial) {
*encoding = sbpr[i].encoding; *encoding = sbpr[i].encoding;
return (sbpr[i].name); return (sbpr[i].name);

4
lib/isccfg/tests/parser_test.c
View File

@@ -146,9 +146,7 @@ addzoneconf(void **state) {
result = cfg_parser_create(mctx, lctx, &p); result = cfg_parser_create(mctx, lctx, &p);
assert_int_equal(result, ISC_R_SUCCESS); assert_int_equal(result, ISC_R_SUCCESS);
#define ARRAYSIZE(x) (sizeof(x) / sizeof(x[0])) for (size_t i = 0; i < ARRAY_SIZE(tests); i++) {
for (size_t i = 0; i < ARRAYSIZE(tests); i++) {
cfg_obj_t *conf = NULL; cfg_obj_t *conf = NULL;
const cfg_obj_t *obj = NULL, *zlist = NULL; const cfg_obj_t *obj = NULL, *zlist = NULL;