Commit 57e54c46 authored by Evan Hunt's avatar Evan Hunt
Browse files

change "expr == false" to "!expr" in conditionals

parent 68a1c9d6
Pipeline #42608 passed with stages
in 28 minutes and 43 seconds
......@@ -62,14 +62,14 @@ typedef struct dlopen_data {
#define MAYBE_LOCK(cd) \
do { \
if ((cd->flags & DNS_SDLZFLAG_THREADSAFE) == 0 && \
cd->in_configure == false) \
!cd->in_configure) \
LOCK(&cd->lock); \
} while (0)
#define MAYBE_UNLOCK(cd) \
do { \
if ((cd->flags & DNS_SDLZFLAG_THREADSAFE) == 0 && \
cd->in_configure == false) \
!cd->in_configure) \
UNLOCK(&cd->lock); \
} while (0)
......
......@@ -62,14 +62,14 @@ typedef struct dlopen_data {
#define MAYBE_LOCK(cd) \
do { \
if ((cd->flags & DNS_SDLZFLAG_THREADSAFE) == 0 && \
cd->in_configure == false) \
!cd->in_configure) \
LOCK(&cd->lock); \
} while (0)
#define MAYBE_UNLOCK(cd) \
do { \
if ((cd->flags & DNS_SDLZFLAG_THREADSAFE) == 0 && \
cd->in_configure == false) \
!cd->in_configure) \
UNLOCK(&cd->lock); \
} while (0)
......
......@@ -1116,7 +1116,7 @@ operation_listOrDelete(bool dlt) {
}
while (bdbres == 0) {
if (dlt == false) {
if (!dlt) {
printf("%.*s | %.*s\n", (int)bdbkey.size,
(char *)bdbkey.data, (int)bdbdata.size,
(char *)bdbdata.data);
......
......@@ -489,7 +489,7 @@ process_dir(isc_dir_t *dir, void *passback, config_data_t *cd,
* are performing a zone xfr and we
* could not find a host entry.
*/
} else if (dir_list != NULL && foundHost == false) {
} else if (dir_list != NULL && !foundHost) {
continue;
}
} else { /* if we cannot stat entry, skip it. */
......
......@@ -502,7 +502,7 @@ process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list,
* are performing a zone xfr and we
* could not find a host entry.
*/
} else if (dir_list != NULL && foundHost == false) {
} else if (dir_list != NULL && !foundHost) {
continue;
}
} else { /* if we cannot stat entry, skip it. */
......
......@@ -812,7 +812,7 @@ check_recursionacls(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions,
continue;
}
if (recursion == false && !dns_acl_isnone(acl)) {
if (!recursion && !dns_acl_isnone(acl)) {
cfg_obj_log(aclobj, logctx, ISC_LOG_WARNING,
"both \"recursion no;\" and "
"\"%s\" active%s%s",
......
......@@ -1111,7 +1111,7 @@ kill_name(dns_adbname_t **n, isc_eventtype_t ev) {
* just kill the name here.
*/
if (!NAME_FETCH(name)) {
INSIST(result == false);
INSIST(!result);
result = unlink_name(adb, name);
free_adbname(adb, &name);
if (result) {
......@@ -1302,7 +1302,7 @@ shutdown_names(dns_adb_t *adb) {
* irefcnt ourselves, since it will not be
* automatically triggered by a name being unlinked.
*/
INSIST(result == false);
INSIST(!result);
result = dec_adb_irefcnt(adb);
} else {
/*
......@@ -1313,7 +1313,7 @@ shutdown_names(dns_adb_t *adb) {
*/
while (name != NULL) {
next_name = ISC_LIST_NEXT(name, plink);
INSIST(result == false);
INSIST(!result);
result = kill_name(&name,
DNS_EVENT_ADBSHUTDOWN);
name = next_name;
......@@ -2442,8 +2442,7 @@ check_stale_name(dns_adb_t *adb, int bucket, isc_stdtime_t now) {
(overmem || victim->last_used + ADB_STALE_MARGIN <= now))
{
RUNTIME_CHECK(
kill_name(&victim, DNS_EVENT_ADBCANCELED) ==
false);
!kill_name(&victim, DNS_EVENT_ADBCANCELED));
victims++;
}
......@@ -2507,7 +2506,7 @@ cleanup_names(dns_adb_t *adb, int bucket, isc_stdtime_t now) {
name = ISC_LIST_HEAD(adb->names[bucket]);
while (name != NULL) {
next_name = ISC_LIST_NEXT(name, plink);
INSIST(result == false);
INSIST(!result);
result = check_expire_namehooks(name, now);
if (!result) {
result = check_expire_name(&name, now);
......@@ -2532,7 +2531,7 @@ cleanup_entries(dns_adb_t *adb, int bucket, isc_stdtime_t now) {
entry = ISC_LIST_HEAD(adb->entries[bucket]);
while (entry != NULL) {
next_entry = ISC_LIST_NEXT(entry, plink);
INSIST(result == false);
INSIST(!result);
result = check_expire_entry(adb, &entry, now);
entry = next_entry;
}
......@@ -3087,7 +3086,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action,
if (adb->name_sd[bucket]) {
DP(DEF_LEVEL, "dns_adb_createfind: returning "
"ISC_R_SHUTTINGDOWN");
RUNTIME_CHECK(free_adbfind(adb, &find) == false);
RUNTIME_CHECK(!free_adbfind(adb, &find));
result = ISC_R_SHUTTINGDOWN;
goto out;
}
......@@ -3104,7 +3103,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action,
adbname = new_adbname(adb, name);
if (adbname == NULL) {
RUNTIME_CHECK(free_adbfind(adb, &find) == false);
RUNTIME_CHECK(!free_adbfind(adb, &find));
result = ISC_R_NOMEMORY;
goto out;
}
......@@ -3128,7 +3127,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action,
/*
* Expire old entries, etc.
*/
RUNTIME_CHECK(check_expire_namehooks(adbname, now) == false);
RUNTIME_CHECK(!check_expire_namehooks(adbname, now));
/*
* Do we know that the name is an alias?
......@@ -3408,8 +3407,7 @@ dns_adb_destroyfind(dns_adbfind_t **findp) {
entry = ai->entry;
ai->entry = NULL;
INSIST(DNS_ADBENTRY_VALID(entry));
RUNTIME_CHECK(dec_entry_refcnt(adb, overmem, entry, true) ==
false);
RUNTIME_CHECK(!dec_entry_refcnt(adb, overmem, entry, true));
free_adbaddrinfo(adb, &ai);
ai = ISC_LIST_HEAD(find->list);
}
......@@ -3506,10 +3504,10 @@ dns_adb_dump(dns_adb_t *adb, FILE *f) {
isc_stdtime_get(&now);
for (i = 0; i < adb->nnames; i++) {
RUNTIME_CHECK(cleanup_names(adb, i, now) == false);
RUNTIME_CHECK(!cleanup_names(adb, i, now));
}
for (i = 0; i < adb->nentries; i++) {
RUNTIME_CHECK(cleanup_entries(adb, i, now) == false);
RUNTIME_CHECK(!cleanup_entries(adb, i, now));
}
dump_adb(adb, f, false, now);
......@@ -4823,10 +4821,10 @@ dns_adb_flush(dns_adb_t *adb) {
* Call our cleanup routines.
*/
for (i = 0; i < adb->nnames; i++) {
RUNTIME_CHECK(cleanup_names(adb, i, INT_MAX) == false);
RUNTIME_CHECK(!cleanup_names(adb, i, INT_MAX));
}
for (i = 0; i < adb->nentries; i++) {
RUNTIME_CHECK(cleanup_entries(adb, i, INT_MAX) == false);
RUNTIME_CHECK(!cleanup_entries(adb, i, INT_MAX));
}
#ifdef DUMP_ADB_AFTER_CLEANING
......@@ -4854,8 +4852,7 @@ dns_adb_flushname(dns_adb_t *adb, const dns_name_t *name) {
if (!NAME_DEAD(adbname) && dns_name_equal(name, &adbname->name))
{
RUNTIME_CHECK(
kill_name(&adbname, DNS_EVENT_ADBCANCELED) ==
false);
!kill_name(&adbname, DNS_EVENT_ADBCANCELED));
}
adbname = nextname;
}
......@@ -4882,7 +4879,7 @@ dns_adb_flushnames(dns_adb_t *adb, const dns_name_t *name) {
dns_name_issubdomain(&adbname->name, name)) {
ret = kill_name(&adbname,
DNS_EVENT_ADBCANCELED);
RUNTIME_CHECK(ret == false);
RUNTIME_CHECK(!ret);
}
adbname = nextname;
}
......
......@@ -1668,7 +1668,7 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
isc_buffer_putstr(buffer, "; ");
}
isc_buffer_putstr(buffer, "}; ");
if (entry->opts.in_memory == false) {
if (!entry->opts.in_memory) {
isc_buffer_putstr(buffer, "file \"");
result = dns_catz_generate_masterfilename(zone, entry, &buffer);
if (result != ISC_R_SUCCESS) {
......@@ -1758,7 +1758,7 @@ dns_catz_dbupdate_callback(dns_db_t *db, void *fn_arg) {
dns_db_attach(db, &zone->db);
}
if (zone->updatepending == false) {
if (!zone->updatepending) {
zone->updatepending = true;
isc_time_now(&now);
tdiff = isc_time_microdiff(&now, &zone->lastupdated) / 1000000;
......@@ -1981,7 +1981,7 @@ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) {
* update callback in zone_startload or axfr_makedb, but we will
* call onupdate() artificially so we can register the callback here.
*/
if (oldzone->db_registered == false) {
if (!oldzone->db_registered) {
result = dns_db_updatenotify_register(
db, dns_catz_dbupdate_callback, oldzone->catzs);
if (result == ISC_R_SUCCESS) {
......@@ -2025,7 +2025,7 @@ dns_catz_postreconfig(dns_catz_zones_t *catzs) {
dns_catz_zone_t *zone = NULL;
isc_ht_iter_current(iter, (void **)&zone);
if (zone->active == false) {
if (!zone->active) {
char cname[DNS_NAME_FORMATSIZE];
dns_name_format(&zone->name, cname,
DNS_NAME_FORMATSIZE);
......
......@@ -186,7 +186,7 @@ dst_lib_init(isc_mem_t *mctx, const char *engine) {
isc_result_t result;
REQUIRE(mctx != NULL);
REQUIRE(dst_initialized == false);
REQUIRE(!dst_initialized);
UNUSED(engine);
......@@ -366,8 +366,7 @@ dst_context_sign(dst_context_t *dctx, isc_buffer_t *sig) {
if (key->func->sign == NULL) {
return (DST_R_NOTPRIVATEKEY);
}
if (key->func->isprivate == NULL || key->func->isprivate(key) == false)
{
if (key->func->isprivate == NULL || !key->func->isprivate(key)) {
return (DST_R_NOTPRIVATEKEY);
}
......@@ -430,7 +429,7 @@ dst_key_computesecret(const dst_key_t *pub, const dst_key_t *priv,
return (DST_R_KEYCANNOTCOMPUTESECRET);
}
if (dst_key_isprivate(priv) == false) {
if (!dst_key_isprivate(priv)) {
return (DST_R_NOTPRIVATEKEY);
}
......
......@@ -46,7 +46,7 @@ static void
initialize(void) {
isc_result_t result;
REQUIRE(initialize_done == false);
REQUIRE(!initialize_done);
isc_refcount_init(&references, 0);
......
......@@ -643,7 +643,7 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
*/
if ((ctx->style.flags & DNS_STYLEFLAG_NO_CLASS) == 0 &&
((ctx->style.flags & DNS_STYLEFLAG_OMIT_CLASS) == 0 ||
ctx->class_printed == false))
!ctx->class_printed))
{
unsigned int class_start;
INDENT_TO(class_column);
......@@ -919,7 +919,7 @@ dump_rdataset(isc_mem_t *mctx, const dns_name_t *name, dns_rdataset_t *rdataset,
*/
if ((ctx->style.flags & DNS_STYLEFLAG_TTL) != 0) {
if (ctx->current_ttl_valid == false ||
if (!ctx->current_ttl_valid ||
ctx->current_ttl != rdataset->ttl) {
if ((ctx->style.flags & DNS_STYLEFLAG_COMMENT) != 0) {
isc_buffer_clear(buffer);
......
......@@ -1652,8 +1652,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
}
free_name = free_rdataset = false;
}
INSIST(free_name == false);
INSIST(free_rdataset == false);
INSIST(!free_name);
INSIST(!free_rdataset);
}
/*
......
......@@ -606,7 +606,7 @@ attachversion(dns_db_t *db, dns_dbversion_t *source,
static void
closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) {
REQUIRE(versionp != NULL && *versionp == (void *)&dummy);
REQUIRE(commit == false);
REQUIRE(!commit);
UNUSED(db);
UNUSED(commit);
......@@ -763,7 +763,6 @@ findnodeext(dns_db_t *db, const dns_name_t *name, bool create,
unsigned int labels;
REQUIRE(VALID_SDB(sdb));
REQUIRE(create == false);
REQUIRE(nodep != NULL && *nodep == NULL);
UNUSED(name);
......
......@@ -529,7 +529,7 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create,
REQUIRE(nodep != NULL && *nodep == NULL);
if (sdlz->dlzimp->methods->newversion == NULL) {
REQUIRE(create == false);
REQUIRE(!create);
}
isc_buffer_init(&b, namestr, sizeof(namestr));
......
......@@ -144,7 +144,7 @@ tsig_log(dns_tsigkey_t *key, int level, const char *fmt, ...) {
char namestr[DNS_NAME_FORMATSIZE];
char creatorstr[DNS_NAME_FORMATSIZE];
if (isc_log_wouldlog(dns_lctx, level) == false) {
if (!isc_log_wouldlog(dns_lctx, level)) {
return;
}
if (key != NULL) {
......
......@@ -210,7 +210,7 @@ update_log(dns_update_log_t *callback, dns_zone_t *zone, int level,
return;
}
if (isc_log_wouldlog(dns_lctx, level) == false) {
if (!isc_log_wouldlog(dns_lctx, level)) {
return;
}
......
......@@ -1512,7 +1512,7 @@ dns_viewlist_findzone(dns_viewlist_t *list, const dns_name_t *name,
for (view = ISC_LIST_HEAD(*list); view != NULL;
view = ISC_LIST_NEXT(view, link))
{
if (allclasses == false && view->rdclass != rdclass) {
if (!allclasses && view->rdclass != rdclass) {
continue;
}
......
......@@ -1615,7 +1615,7 @@ xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *masteraddr,
const char *fmt, ...) {
va_list ap;
if (isc_log_wouldlog(dns_lctx, level) == false) {
if (!isc_log_wouldlog(dns_lctx, level)) {
return;
}
......@@ -1633,7 +1633,7 @@ xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...) {
va_list ap;
char zonetext[DNS_NAME_MAXTEXT + 32];
if (isc_log_wouldlog(dns_lctx, level) == false) {
if (!isc_log_wouldlog(dns_lctx, level)) {
return;
}
......
......@@ -156,11 +156,11 @@ typedef struct dns_include dns_include_t;
 
#define DNS_ZONE_CHECKLOCK
#ifdef DNS_ZONE_CHECKLOCK
#define LOCK_ZONE(z) \
do { \
LOCK(&(z)->lock); \
INSIST((z)->locked == false); \
(z)->locked = true; \
#define LOCK_ZONE(z) \
do { \
LOCK(&(z)->lock); \
INSIST(!(z)->locked); \
(z)->locked = true; \
} while (0)
#define UNLOCK_ZONE(z) \
do { \
......@@ -172,7 +172,7 @@ typedef struct dns_include dns_include_t;
do { \
result = isc_mutex_trylock(&(z)->lock); \
if (result == ISC_R_SUCCESS) { \
INSIST((z)->locked == false); \
INSIST(!(z)->locked); \
(z)->locked = true; \
} \
} while (0)
......@@ -10775,7 +10775,7 @@ zone_refreshkeys(dns_zone_t *zone) {
*/
 
#ifdef ENABLE_AFL
if (dns_fuzzing_resolver == false) {
if (!dns_fuzzing_resolver) {
#endif /* ifdef ENABLE_AFL */
result = dns_resolver_createfetch(
zone->view->resolver, kname,
......@@ -12779,7 +12779,7 @@ next_master:
* Did we get a good answer from all the masters?
*/
for (j = 0; j < zone->masterscnt; j++) {
if (zone->mastersok[j] == false) {
if (!zone->mastersok[j]) {
{
done = false;
break;
......@@ -13303,7 +13303,7 @@ next_master:
* Did we get a good answer from all the masters?
*/
for (j = 0; j < zone->masterscnt; j++) {
if (zone->mastersok[j] == false) {
if (!zone->mastersok[j]) {
{
done = false;
break;
......@@ -17018,7 +17018,7 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
if (peer == NULL || result != ISC_R_SUCCESS) {
use_ixfr = zone->requestixfr;
}
if (use_ixfr == false) {
if (!use_ixfr) {
dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN,
ISC_LOG_DEBUG(1),
"IXFR disabled, "
......
......@@ -266,7 +266,7 @@ isc_app_ctxrun(isc_appctx_t *ctx) {
* simply be made pending and we will get it when we call
* sigwait().
*/
while (atomic_load_acquire(&ctx->want_shutdown) == false) {
while (!atomic_load_acquire(&ctx->want_shutdown)) {
#ifdef WIN32
DWORD dwWaitResult = WaitForMultipleObjects(
NUM_EVENTS, ctx->hEvents, FALSE, INFINITE);
......@@ -424,7 +424,7 @@ isc_app_ctxsuspend(isc_appctx_t *ctx) {
/*
* Don't send the reload signal if we're shutting down.
*/
if (atomic_load_acquire(&ctx->shutdown_requested) == false) {
if (!atomic_load_acquire(&ctx->shutdown_requested)) {
#ifdef WIN32
SetEvent(ctx->hEvents[RELOAD_EVENT]);
#else /* WIN32 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment