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_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

77
lib/dns/masterdump.c
View File

@@ -14,6 +14,7 @@
#include <config.h>
#include <inttypes.h>
#include <stdbool.h>
#include <stdlib.h>
#include <isc/buffer.h>
@@ -85,14 +86,14 @@ struct dns_master_style {
*/
typedef struct dns_totext_ctx {
dns_master_style_t style;
isc_boolean_t class_printed;
bool class_printed;
char * linebreak;
char linebreak_buf[DNS_TOTEXT_LINEBREAK_MAXLEN];
dns_name_t * origin;
dns_name_t * neworigin;
dns_fixedname_t origin_fixname;
uint32_t current_ttl;
isc_boolean_t current_ttl_valid;
bool current_ttl_valid;
dns_ttl_t serve_stale_ttl;
} dns_totext_ctx_t;
@@ -220,9 +221,9 @@ struct dns_dumpctx {
isc_mem_t *mctx;
isc_mutex_t lock;
unsigned int references;
isc_boolean_t canceled;
isc_boolean_t first;
isc_boolean_t do_date;
bool canceled;
bool first;
bool do_date;
isc_stdtime_t now;
FILE *f;
dns_db_t *db;
@@ -319,7 +320,7 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
REQUIRE(style->tab_width != 0);
ctx->style = *style;
ctx->class_printed = ISC_FALSE;
ctx->class_printed = false;
dns_fixedname_init(&ctx->origin_fixname);
@@ -386,7 +387,7 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
ctx->origin = NULL;
ctx->neworigin = NULL;
ctx->current_ttl = 0;
ctx->current_ttl_valid = ISC_FALSE;
ctx->current_ttl_valid = false;
ctx->serve_stale_ttl = 0;
return (ISC_R_SUCCESS);
@@ -422,7 +423,7 @@ str_totext(const char *source, isc_buffer_t *target) {
}
static isc_result_t
ncache_summary(dns_rdataset_t *rdataset, isc_boolean_t omit_final_dot,
ncache_summary(dns_rdataset_t *rdataset, bool omit_final_dot,
isc_buffer_t *target)
{
isc_result_t result = ISC_R_SUCCESS;
@@ -478,14 +479,14 @@ static isc_result_t
rdataset_totext(dns_rdataset_t *rdataset,
const dns_name_t *owner_name,
dns_totext_ctx_t *ctx,
isc_boolean_t omit_final_dot,
bool omit_final_dot,
isc_buffer_t *target)
{
isc_result_t result;
unsigned int column;
isc_boolean_t first = ISC_TRUE;
bool first = true;
uint32_t current_ttl;
isc_boolean_t current_ttl_valid;
bool current_ttl_valid;
dns_rdatatype_t type;
unsigned int type_start;
dns_fixedname_t fixed;
@@ -559,7 +560,7 @@ rdataset_totext(dns_rdataset_t *rdataset,
if ((ctx->style.flags & DNS_STYLEFLAG_TTL_UNITS) != 0) {
length = target->used;
result = dns_ttl_totext(rdataset->ttl,
ISC_FALSE, ISC_FALSE,
false, false,
target);
if (result != ISC_R_SUCCESS)
return (result);
@@ -582,7 +583,7 @@ rdataset_totext(dns_rdataset_t *rdataset,
*/
if ((ctx->style.flags & DNS_STYLEFLAG_TTL) == 0) {
current_ttl = rdataset->ttl;
current_ttl_valid = ISC_TRUE;
current_ttl_valid = true;
}
}
@@ -591,7 +592,7 @@ rdataset_totext(dns_rdataset_t *rdataset,
*/
if ((ctx->style.flags & DNS_STYLEFLAG_NO_CLASS) == 0 &&
((ctx->style.flags & DNS_STYLEFLAG_OMIT_CLASS) == 0 ||
ctx->class_printed == ISC_FALSE))
ctx->class_printed == false))
{
unsigned int class_start;
INDENT_TO(class_column);
@@ -687,7 +688,7 @@ rdataset_totext(dns_rdataset_t *rdataset,
isc_buffer_add(target, 1);
}
first = ISC_FALSE;
first = false;
result = dns_rdataset_next(rdataset);
}
@@ -701,7 +702,7 @@ rdataset_totext(dns_rdataset_t *rdataset,
* times with increasing buffer sizes until it succeeds,
* and failed attempts must not update the state prematurely.
*/
ctx->class_printed = ISC_TRUE;
ctx->class_printed = true;
ctx->current_ttl= current_ttl;
ctx->current_ttl_valid = current_ttl_valid;
@@ -717,7 +718,7 @@ static isc_result_t
question_totext(dns_rdataset_t *rdataset,
const dns_name_t *owner_name,
dns_totext_ctx_t *ctx,
isc_boolean_t omit_final_dot,
bool omit_final_dot,
isc_buffer_t *target)
{
unsigned int column;
@@ -783,8 +784,8 @@ question_totext(dns_rdataset_t *rdataset,
isc_result_t
dns_rdataset_totext(dns_rdataset_t *rdataset,
const dns_name_t *owner_name,
isc_boolean_t omit_final_dot,
isc_boolean_t question,
bool omit_final_dot,
bool question,
isc_buffer_t *target)
{
dns_totext_ctx_t ctx;
@@ -829,7 +830,7 @@ dns_master_rdatasettotext(const dns_name_t *owner_name,
}
return (rdataset_totext(rdataset, owner_name, &ctx,
ISC_FALSE, target));
false, target));
}
isc_result_t
@@ -848,7 +849,7 @@ dns_master_questiontotext(const dns_name_t *owner_name,
}
return (question_totext(rdataset, owner_name, &ctx,
ISC_FALSE, target));
false, target));
}
/*
@@ -873,14 +874,14 @@ dump_rdataset(isc_mem_t *mctx, const dns_name_t *name,
*/
if ((ctx->style.flags & DNS_STYLEFLAG_TTL) != 0) {
if (ctx->current_ttl_valid == ISC_FALSE ||
if (ctx->current_ttl_valid == false ||
ctx->current_ttl != rdataset->ttl)
{
if ((ctx->style.flags & DNS_STYLEFLAG_COMMENT) != 0)
{
isc_buffer_clear(buffer);
result = dns_ttl_totext(rdataset->ttl,
ISC_TRUE, ISC_TRUE,
true, true,
buffer);
INSIST(result == ISC_R_SUCCESS);
isc_buffer_usedregion(buffer, &r);
@@ -890,7 +891,7 @@ dump_rdataset(isc_mem_t *mctx, const dns_name_t *name,
fprintf(f, "$TTL %u\n", rdataset->ttl);
}
ctx->current_ttl = rdataset->ttl;
ctx->current_ttl_valid = ISC_TRUE;
ctx->current_ttl_valid = true;
}
}
@@ -904,7 +905,7 @@ dump_rdataset(isc_mem_t *mctx, const dns_name_t *name,
int newlength;
void *newmem;
result = rdataset_totext(rdataset, name, ctx,
ISC_FALSE, buffer);
false, buffer);
if (result != ISC_R_NOSPACE)
break;
@@ -1002,7 +1003,7 @@ dump_rdatasets_text(isc_mem_t *mctx, const dns_name_t *name,
if (itresult == ISC_R_SUCCESS && ctx->neworigin != NULL) {
isc_buffer_clear(buffer);
itresult = dns_name_totext(ctx->neworigin, ISC_FALSE, buffer);
itresult = dns_name_totext(ctx->neworigin, false, buffer);
RUNTIME_CHECK(itresult == ISC_R_SUCCESS);
isc_buffer_usedregion(buffer, &r);
fprintf(f, "$ORIGIN %.*s\n", (int) r.length, (char *) r.base);
@@ -1262,7 +1263,7 @@ dumpctx_destroy(dns_dumpctx_t *dctx) {
DESTROYLOCK(&dctx->lock);
dns_dbiterator_destroy(&dctx->dbiter);
if (dctx->version != NULL)
dns_db_closeversion(dctx->db, &dctx->version, ISC_FALSE);
dns_db_closeversion(dctx->db, &dctx->version, false);
dns_db_detach(&dctx->db);
if (dctx->task != NULL)
isc_task_detach(&dctx->task);
@@ -1291,7 +1292,7 @@ dns_dumpctx_attach(dns_dumpctx_t *source, dns_dumpctx_t **target) {
void
dns_dumpctx_detach(dns_dumpctx_t **dctxp) {
dns_dumpctx_t *dctx;
isc_boolean_t need_destroy = ISC_FALSE;
bool need_destroy = false;
REQUIRE(dctxp != NULL);
dctx = *dctxp;
@@ -1303,7 +1304,7 @@ dns_dumpctx_detach(dns_dumpctx_t **dctxp) {
INSIST(dctx->references != 0);
dctx->references--;
if (dctx->references == 0)
need_destroy = ISC_TRUE;
need_destroy = true;
UNLOCK(&dctx->lock);
if (need_destroy)
dumpctx_destroy(dctx);
@@ -1326,13 +1327,13 @@ dns_dumpctx_cancel(dns_dumpctx_t *dctx) {
REQUIRE(DNS_DCTX_VALID(dctx));
LOCK(&dctx->lock);
dctx->canceled = ISC_TRUE;
dctx->canceled = true;
UNLOCK(&dctx->lock);
}
static isc_result_t
flushandsync(FILE *f, isc_result_t result, const char *temp) {
isc_boolean_t logit = ISC_TF(result == ISC_R_SUCCESS);
bool logit = (result == ISC_R_SUCCESS);
if (result == ISC_R_SUCCESS)
result = isc_stdio_flush(f);
@@ -1347,7 +1348,7 @@ flushandsync(FILE *f, isc_result_t result, const char *temp) {
DNS_LOGMODULE_MASTERDUMP, ISC_LOG_ERROR,
"dumping to stream: flush: %s",
isc_result_totext(result));
logit = ISC_FALSE;
logit = false;
}
if (result == ISC_R_SUCCESS)
@@ -1371,11 +1372,11 @@ static isc_result_t
closeandrename(FILE *f, isc_result_t result, const char *temp, const char *file)
{
isc_result_t tresult;
isc_boolean_t logit = ISC_TF(result == ISC_R_SUCCESS);
bool logit = (result == ISC_R_SUCCESS);
result = flushandsync(f, result, temp);
if (result != ISC_R_SUCCESS)
logit = ISC_FALSE;
logit = false;
tresult = isc_stdio_close(f);
if (result == ISC_R_SUCCESS)
@@ -1385,7 +1386,7 @@ closeandrename(FILE *f, isc_result_t result, const char *temp, const char *file)
DNS_LOGMODULE_MASTERDUMP, ISC_LOG_ERROR,
"dumping master file: %s: fclose: %s",
temp, isc_result_totext(result));
logit = ISC_FALSE;
logit = false;
}
if (result == ISC_R_SUCCESS)
result = isc_file_rename(temp, file);
@@ -1465,8 +1466,8 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
dctx->done_arg = NULL;
dctx->task = NULL;
dctx->nodes = 0;
dctx->first = ISC_TRUE;
dctx->canceled = ISC_FALSE;
dctx->first = true;
dctx->canceled = false;
dctx->file = NULL;
dctx->tmpfile = NULL;
dctx->format = format;
@@ -1670,7 +1671,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
if (result != ISC_R_SUCCESS && result != ISC_R_NOMORE)
goto cleanup;
dctx->first = ISC_FALSE;
dctx->first = false;
} else
result = ISC_R_SUCCESS;