ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Replace custom isc_boolean_t with C standard bool type

Browse Source
This commit is contained in:
Ondřej Surý
2018-04-17 08:29:14 -07:00
parent cb6a185c69
commit 994e656977
546 changed files with 10785 additions and 10367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
bin/tests/optional/db_test.c
View File

@@ -15,6 +15,7 @@
#include <config.h>
#include <inttypes.h>
#include <stdbool.h>
#include <stdlib.h>
#include <isc/commandline.h>
@@ -48,7 +49,7 @@ typedef struct dbinfo {
dns_dbiterator_t * dbiterator;
dns_dbversion_t * iversion;
int pause_every;
isc_boolean_t ascending;
bool ascending;
ISC_LINK(struct dbinfo) link;
} dbinfo;
@@ -58,7 +59,7 @@ static dns_dbtable_t * dbtable;
static ISC_LIST(dbinfo) dbs;
static dbinfo * cache_dbi = NULL;
static int pause_every = 0;
static isc_boolean_t ascending = ISC_TRUE;
static bool ascending = true;
static void
print_result(const char *message, isc_result_t result) {
@@ -77,7 +78,7 @@ print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) {
isc_region_t r;
isc_buffer_init(&text, t, sizeof(t));
result = dns_rdataset_totext(rdataset, name, ISC_FALSE, ISC_FALSE,
result = dns_rdataset_totext(rdataset, name, false, false,
&text);
isc_buffer_usedregion(&text, &r);
if (result == ISC_R_SUCCESS)
@@ -218,11 +219,11 @@ list(dbinfo *dbi, char *seektext) {
dns_dbiterator_destroy(&dbi->dbiterator);
if (dbi->iversion != NULL)
dns_db_closeversion(dbi->db, &dbi->iversion, ISC_FALSE);
dns_db_closeversion(dbi->db, &dbi->iversion, false);
}
static isc_result_t
load(const char *filename, const char *origintext, isc_boolean_t cache) {
load(const char *filename, const char *origintext, bool cache) {
dns_fixedname_t forigin;
dns_name_t *origin;
isc_result_t result;
@@ -333,17 +334,17 @@ main(int argc, char *argv[]) {
dns_rdataset_t rdataset, sigrdataset;
int ch;
dns_rdatatype_t type = 1;
isc_boolean_t printnode = ISC_FALSE;
isc_boolean_t addmode = ISC_FALSE;
isc_boolean_t delmode = ISC_FALSE;
isc_boolean_t holdmode = ISC_FALSE;
isc_boolean_t verbose = ISC_FALSE;
isc_boolean_t done = ISC_FALSE;
isc_boolean_t quiet = ISC_FALSE;
isc_boolean_t time_lookups = ISC_FALSE;
isc_boolean_t found_as;
isc_boolean_t find_zonecut = ISC_FALSE;
isc_boolean_t noexact_zonecut = ISC_FALSE;
bool printnode = false;
bool addmode = false;
bool delmode = false;
bool holdmode = false;
bool verbose = false;
bool done = false;
bool quiet = false;
bool time_lookups = false;
bool found_as;
bool find_zonecut = false;
bool noexact_zonecut = false;
int i, v;
dns_rdatasetiter_t *rdsiter;
char t1[256];
@@ -375,7 +376,7 @@ main(int argc, char *argv[]) {
!= -1) {
switch (ch) {
case 'c':
result = load(isc_commandline_argument, ".", ISC_TRUE);
result = load(isc_commandline_argument, ".", true);
if (result != ISC_R_SUCCESS)
printf("cache load(%s) %08x: %s\n",
isc_commandline_argument, result,
@@ -401,11 +402,11 @@ main(int argc, char *argv[]) {
dns_log_setcontext(lctx);
break;
case 'q':
quiet = ISC_TRUE;
verbose = ISC_FALSE;
quiet = true;
verbose = false;
break;
case 'p':
printnode = ISC_TRUE;
printnode = true;
break;
case 'P':
pause_every = atoi(isc_commandline_argument);
@@ -418,10 +419,10 @@ main(int argc, char *argv[]) {
type = atoi(isc_commandline_argument);
break;
case 'T':
time_lookups = ISC_TRUE;
time_lookups = true;
break;
case 'v':
verbose = ISC_TRUE;
verbose = true;
break;
case 'z':
origintext = strrchr(isc_commandline_argument, '/');
@@ -430,7 +431,7 @@ main(int argc, char *argv[]) {
else
origintext++; /* Skip '/'. */
result = load(isc_commandline_argument, origintext,
ISC_FALSE);
false);
if (result != ISC_R_SUCCESS)
printf("zone load(%s) %08x: %s\n",
isc_commandline_argument, result,
@@ -462,7 +463,7 @@ main(int argc, char *argv[]) {
if (!quiet)
printf("\n");
if (fgets(s, sizeof(s), stdin) == NULL) {
done = ISC_TRUE;
done = true;
continue;
}
len = strlen(s);
@@ -510,8 +511,8 @@ main(int argc, char *argv[]) {
continue;
} else if (strcmp(s, "!C") == 0) {
DBI_CHECK(dbi);
addmode = ISC_FALSE;
delmode = ISC_FALSE;
addmode = false;
delmode = false;
if (dbi->version == NULL)
continue;
if (dbi->version == dbi->wversion) {
@@ -528,13 +529,13 @@ main(int argc, char *argv[]) {
}
}
}
dns_db_closeversion(dbi->db, &dbi->version, ISC_TRUE);
dns_db_closeversion(dbi->db, &dbi->version, true);
version = NULL;
continue;
} else if (strcmp(s, "!X") == 0) {
DBI_CHECK(dbi);
addmode = ISC_FALSE;
delmode = ISC_FALSE;
addmode = false;
delmode = false;
if (dbi->version == NULL)
continue;
if (dbi->version == dbi->wversion) {
@@ -551,33 +552,33 @@ main(int argc, char *argv[]) {
}
}
}
dns_db_closeversion(dbi->db, &dbi->version, ISC_FALSE);
dns_db_closeversion(dbi->db, &dbi->version, false);
version = NULL;
continue;
} else if (strcmp(s, "!A") == 0) {
DBI_CHECK(dbi);
delmode = ISC_FALSE;
delmode = false;
if (addmode)
addmode = ISC_FALSE;
addmode = false;
else
addmode = ISC_TRUE;
addmode = true;
printf("addmode = %s\n", addmode ? "TRUE" : "FALSE");
continue;
} else if (strcmp(s, "!D") == 0) {
DBI_CHECK(dbi);
addmode = ISC_FALSE;
addmode = false;
if (delmode)
delmode = ISC_FALSE;
delmode = false;
else
delmode = ISC_TRUE;
delmode = true;
printf("delmode = %s\n", delmode ? "TRUE" : "FALSE");
continue;
} else if (strcmp(s, "!H") == 0) {
DBI_CHECK(dbi);
if (holdmode)
holdmode = ISC_FALSE;
holdmode = false;
else
holdmode = ISC_TRUE;
holdmode = true;
printf("holdmode = %s\n", holdmode ? "TRUE" : "FALSE");
continue;
} else if (strcmp(s, "!HR") == 0) {
@@ -586,7 +587,7 @@ main(int argc, char *argv[]) {
dns_db_detachnode(dbi->db,
&dbi->hold_nodes[i]);
dbi->hold_count = 0;
holdmode = ISC_FALSE;
holdmode = false;
printf("held nodes have been detached\n");
continue;
} else if (strcmp(s, "!VC") == 0) {
@@ -663,9 +664,9 @@ main(int argc, char *argv[]) {
continue;
} else if (strcmp(s, "!PN") == 0) {
if (printnode)
printnode = ISC_FALSE;
printnode = false;
else
printnode = ISC_TRUE;
printnode = true;
printf("printnode = %s\n",
printnode ? "TRUE" : "FALSE");
continue;
@@ -676,11 +677,11 @@ main(int argc, char *argv[]) {
continue;
} else if (strcmp(s, "!+") == 0) {
DBI_CHECK(dbi);
dbi->ascending = ISC_TRUE;
dbi->ascending = true;
continue;
} else if (strcmp(s, "!-") == 0) {
DBI_CHECK(dbi);
dbi->ascending = ISC_FALSE;
dbi->ascending = false;
continue;
} else if (strcmp(s, "!DB") == 0) {
dbi = NULL;
@@ -694,9 +695,9 @@ main(int argc, char *argv[]) {
db = dbi->db;
origin = dns_db_origin(dbi->db);
version = dbi->version;
addmode = ISC_FALSE;
delmode = ISC_FALSE;
holdmode = ISC_FALSE;
addmode = false;
delmode = false;
holdmode = false;
} else {
db = NULL;
version = NULL;
@@ -707,17 +708,17 @@ main(int argc, char *argv[]) {
continue;
} else if (strcmp(s, "!ZC") == 0) {
if (find_zonecut)
find_zonecut = ISC_FALSE;
find_zonecut = false;
else
find_zonecut = ISC_TRUE;
find_zonecut = true;
printf("find_zonecut = %s\n",
find_zonecut ? "TRUE" : "FALSE");
continue;
} else if (strcmp(s, "!NZ") == 0) {
if (noexact_zonecut)
noexact_zonecut = ISC_FALSE;
noexact_zonecut = false;
else
noexact_zonecut = ISC_TRUE;
noexact_zonecut = true;
printf("noexact_zonecut = %s\n",
noexact_zonecut ? "TRUE" : "FALSE");
continue;
@@ -748,7 +749,7 @@ main(int argc, char *argv[]) {
continue;
}
isc_buffer_init(&tb1, t1, sizeof(t1));
result = dns_name_totext(dns_db_origin(db), ISC_FALSE,
result = dns_name_totext(dns_db_origin(db), false,
&tb1);
if (result != ISC_R_SUCCESS) {
printf("\n");
@@ -784,7 +785,7 @@ main(int argc, char *argv[]) {
print_result("", result);
}
found_as = ISC_FALSE;
found_as = false;
switch (result) {
case ISC_R_SUCCESS:
case DNS_R_GLUE:
@@ -793,7 +794,7 @@ main(int argc, char *argv[]) {
break;
case DNS_R_DNAME:
case DNS_R_DELEGATION:
found_as = ISC_TRUE;
found_as = true;
break;
case DNS_R_NXRRSET:
if (dns_rdataset_isassociated(&rdataset))
@@ -826,7 +827,7 @@ main(int argc, char *argv[]) {
if (found_as && !quiet) {
isc_buffer_init(&tb1, t1, sizeof(t1));
isc_buffer_init(&tb2, t2, sizeof(t2));
result = dns_name_totext(&name, ISC_FALSE, &tb1);
result = dns_name_totext(&name, false, &tb1);
if (result != ISC_R_SUCCESS) {
print_result("", result);
dns_db_detachnode(db, &node);
@@ -834,7 +835,7 @@ main(int argc, char *argv[]) {
dns_db_detach(&db);
continue;
}
result = dns_name_totext(fname, ISC_FALSE, &tb2);
result = dns_name_totext(fname, false, &tb2);
if (result != ISC_R_SUCCESS) {
print_result("", result);
dns_db_detachnode(db, &node);