Replace custom isc_boolean_t with C standard bool type

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

View File

@@ -13,6 +13,7 @@
#include <config.h>
#include <inttypes.h>
#include <stdbool.h>
#include <isc/string.h>
#include <isc/util.h>
@@ -184,7 +185,7 @@ attachversion(dns_db_t *db, dns_dbversion_t *source,
}
static void
closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) {
sampledb_t *sampledb = (sampledb_t *)db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -193,7 +194,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
}
static isc_result_t
findnode(dns_db_t *db, const dns_name_t *name, isc_boolean_t create,
findnode(dns_db_t *db, const dns_name_t *name, bool create,
dns_dbnode_t **nodep)
{
sampledb_t *sampledb = (sampledb_t *) db;
@@ -374,7 +375,7 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
type, covers));
}
static isc_boolean_t
static bool
issecure(dns_db_t *db) {
sampledb_t *sampledb = (sampledb_t *) db;
@@ -394,17 +395,17 @@ nodecount(dns_db_t *db) {
/*
* The database does not need to be loaded from disk or written to disk.
* Always return ISC_TRUE.
* Always return true.
*/
static isc_boolean_t
static bool
ispersistent(dns_db_t *db) {
UNUSED(db);
return (ISC_TRUE);
return (true);
}
static void
overmem(dns_db_t *db, isc_boolean_t over) {
overmem(dns_db_t *db, bool over) {
sampledb_t *sampledb = (sampledb_t *) db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -457,7 +458,7 @@ getnsec3parameters(dns_db_t *db, dns_dbversion_t *version,
}
static isc_result_t
findnsec3node(dns_db_t *db, const dns_name_t *name, isc_boolean_t create,
findnsec3node(dns_db_t *db, const dns_name_t *name, bool create,
dns_dbnode_t **nodep)
{
sampledb_t *sampledb = (sampledb_t *) db;
@@ -494,7 +495,7 @@ resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version) {
dns_db_resigned(sampledb->rbtdb, rdataset, version);
}
static isc_boolean_t
static bool
isdnssec(dns_db_t *db) {
sampledb_t *sampledb = (sampledb_t *) db;
@@ -515,7 +516,7 @@ getrrsetstats(dns_db_t *db) {
static isc_result_t
findnodeext(dns_db_t *db, const dns_name_t *name,
isc_boolean_t create, dns_clientinfomethods_t *methods,
bool create, dns_clientinfomethods_t *methods,
dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep)
{
sampledb_t *sampledb = (sampledb_t *) db;
@@ -647,7 +648,7 @@ add_soa(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name,
rdatalist.ttl = 86400;
ISC_LIST_APPEND(rdatalist.rdata, &rdata, link);
CHECK(dns_rdatalist_tordataset(&rdatalist, &rdataset));
CHECK(dns_db_findnode(db, name, ISC_TRUE, &node));
CHECK(dns_db_findnode(db, name, true, &node));
CHECK(dns_db_addrdataset(db, node, version, 0, &rdataset, 0, NULL));
cleanup:
if (node != NULL)
@@ -686,7 +687,7 @@ add_ns(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name,
rdatalist.ttl = 86400;
ISC_LIST_APPEND(rdatalist.rdata, &rdata, link);
CHECK(dns_rdatalist_tordataset(&rdatalist, &rdataset));
CHECK(dns_db_findnode(db, name, ISC_TRUE, &node));
CHECK(dns_db_findnode(db, name, true, &node));
CHECK(dns_db_addrdataset(db, node, version, 0, &rdataset, 0, NULL));
cleanup:
if (node != NULL)
@@ -722,7 +723,7 @@ add_a(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name,
rdatalist.ttl = 86400;
ISC_LIST_APPEND(rdatalist.rdata, &rdata, link);
CHECK(dns_rdatalist_tordataset(&rdatalist, &rdataset));
CHECK(dns_db_findnode(db, name, ISC_TRUE, &node));
CHECK(dns_db_findnode(db, name, true, &node));
CHECK(dns_db_addrdataset(db, node, version, 0, &rdataset, 0, NULL));
cleanup:
if (node != NULL)
@@ -786,7 +787,7 @@ create_db(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
CHECK(add_soa(sampledb->rbtdb, version, origin, origin, origin));
CHECK(add_ns(sampledb->rbtdb, version, origin, origin));
CHECK(add_a(sampledb->rbtdb, version, origin, a_addr));
dns_db_closeversion(sampledb->rbtdb, &version, ISC_TRUE);
dns_db_closeversion(sampledb->rbtdb, &version, true);
*dbp = (dns_db_t *)sampledb;

View File

@@ -7,6 +7,8 @@
#ifndef _LD_INSTANCE_H_
#define _LD_INSTANCE_H_
#include <stdbool.h>
#include <dns/fixedname.h>
#include <dns/name.h>
#include <dns/types.h>
@@ -20,7 +22,7 @@ struct sample_instance {
dns_view_t *view;
dns_zonemgr_t *zmgr;
isc_task_t *task;
isc_boolean_t exiting;
bool exiting;
dns_zone_t *zone1;
dns_fixedname_t zone1_fn;

View File

@@ -64,7 +64,7 @@ syncptr_write(isc_task_t *task, isc_event_t *event) {
cleanup:
if (db != NULL) {
if (version != NULL)
dns_db_closeversion(db, &version, ISC_TRUE);
dns_db_closeversion(db, &version, true);
dns_db_detach(&db);
}
dns_zone_detach(&pevent->zone);

View File

@@ -7,6 +7,7 @@
#include <config.h>
#include <inttypes.h>
#include <stdbool.h>
#include <isc/util.h>
@@ -81,7 +82,7 @@ cleanup:
static isc_result_t
publish_zone(sample_instance_t *inst, dns_zone_t *zone) {
isc_result_t result;
isc_boolean_t freeze = ISC_FALSE;
bool freeze = false;
dns_zone_t *zone_in_view = NULL;
dns_view_t *view_in_zone = NULL;
isc_result_t lock_state = ISC_R_IGNORE;
@@ -123,7 +124,7 @@ publish_zone(sample_instance_t *inst, dns_zone_t *zone) {
run_exclusive_enter(inst, &lock_state);
if (inst->view->frozen) {
freeze = ISC_TRUE;
freeze = true;
dns_view_thaw(inst->view);
}
@@ -147,7 +148,7 @@ cleanup:
static isc_result_t
load_zone(dns_zone_t *zone) {
isc_result_t result;
isc_boolean_t zone_dynamic;
bool zone_dynamic;
uint32_t serial;
result = dns_zone_load(zone);