diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c index 5b0e7a5507..e6e9e2e02a 100644 --- a/bin/named/unix/dlz_dlopen_driver.c +++ b/bin/named/unix/dlz_dlopen_driver.c @@ -65,14 +65,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) diff --git a/bin/named/win32/dlz_dlopen_driver.c b/bin/named/win32/dlz_dlopen_driver.c index 1a9c85e14a..f21abcf052 100644 --- a/bin/named/win32/dlz_dlopen_driver.c +++ b/bin/named/win32/dlz_dlopen_driver.c @@ -63,14 +63,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) diff --git a/contrib/dlz/bin/dlzbdb/dlzbdb.c b/contrib/dlz/bin/dlzbdb/dlzbdb.c index 13bdca3f02..f77ebb1505 100644 --- a/contrib/dlz/bin/dlzbdb/dlzbdb.c +++ b/contrib/dlz/bin/dlzbdb/dlzbdb.c @@ -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); diff --git a/contrib/dlz/drivers/dlz_filesystem_driver.c b/contrib/dlz/drivers/dlz_filesystem_driver.c index 779ab1c789..8ed1af1b33 100644 --- a/contrib/dlz/drivers/dlz_filesystem_driver.c +++ b/contrib/dlz/drivers/dlz_filesystem_driver.c @@ -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. */ diff --git a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c index a6049c2849..ceb5dfe3cd 100644 --- a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c +++ b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c @@ -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. */ diff --git a/lib/bind9/check.c b/lib/bind9/check.c index 2a5e63c54b..40192669ad 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -811,7 +811,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", diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 8df418d189..14c40eb4b9 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -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; } diff --git a/lib/dns/catz.c b/lib/dns/catz.c index 454d075ff2..f66bec7af9 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -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); diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c index 4e587d24ea..df410e4470 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -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); } diff --git a/lib/dns/lib.c b/lib/dns/lib.c index b4e7f1c6d5..8690934f3a 100644 --- a/lib/dns/lib.c +++ b/lib/dns/lib.c @@ -48,7 +48,7 @@ static void initialize(void) { isc_result_t result; - REQUIRE(initialize_done == false); + REQUIRE(!initialize_done); isc_refcount_init(&references, 0); diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index 12376b50d1..0d1bed1a29 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -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); diff --git a/lib/dns/message.c b/lib/dns/message.c index bd10c7d678..1448fd1df6 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -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); } /* diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c index 2d85032a31..ffc53f758d 100644 --- a/lib/dns/sdb.c +++ b/lib/dns/sdb.c @@ -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); diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c index fcdf0e66d8..172d21d782 100644 --- a/lib/dns/sdlz.c +++ b/lib/dns/sdlz.c @@ -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)); diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index c940469520..591dfca77a 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -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) { diff --git a/lib/dns/update.c b/lib/dns/update.c index 76d4cee4ef..49f177002b 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -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; } diff --git a/lib/dns/view.c b/lib/dns/view.c index c9733d91d0..86f3aea797 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -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; } diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index 5040f7334f..b124f22098 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -1629,7 +1629,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; } @@ -1647,7 +1647,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; } diff --git a/lib/dns/zone.c b/lib/dns/zone.c index ecccab73ad..828f573b0f 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -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) @@ -10737,7 +10737,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, @@ -12741,7 +12741,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; @@ -13265,7 +13265,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; @@ -16980,7 +16980,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, " diff --git a/lib/isc/app.c b/lib/isc/app.c index d292d1c022..d66894927a 100644 --- a/lib/isc/app.c +++ b/lib/isc/app.c @@ -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 */ diff --git a/lib/isc/astack.c b/lib/isc/astack.c index 8ae0d515d5..1c9c324c66 100644 --- a/lib/isc/astack.c +++ b/lib/isc/astack.c @@ -43,7 +43,7 @@ isc_astack_new(isc_mem_t *mctx, size_t size) { bool isc_astack_trypush(isc_astack_t *stack, void *obj) { - if (isc_mutex_trylock(&stack->lock) == false) { + if (!isc_mutex_trylock(&stack->lock)) { if (stack->pos >= stack->size) { UNLOCK(&stack->lock); return (false); diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c index 899406ef73..3cc02bbb64 100644 --- a/lib/isc/pthreads/mutex.c +++ b/lib/isc/pthreads/mutex.c @@ -92,7 +92,7 @@ isc_mutex_init_profile(isc_mutex_t *mp, const char *file, int line) { RUNTIME_CHECK(pthread_mutex_lock(&statslock) == 0); - if (stats_init == false) { + if (!stats_init) { stats_init = true; } diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index c93a635654..d418cfdf1b 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -1463,7 +1463,7 @@ consistent(isc_socket_t *sock) { socket_log(__LINE__, sock, NULL, CREATION, "SOCKET INCONSISTENT: %s", crash_reason); sock_dump(sock); - INSIST(crash == false); + INSIST(!crash); } } diff --git a/lib/ns/client.c b/lib/ns/client.c index 657495e4a5..14f9618b07 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -518,7 +518,7 @@ ns_client_send(ns_client_t *client) { dns_compress_setsensitive(&cctx, true); } - if (client->view->msgcompression == false) { + if (!client->view->msgcompression) { dns_compress_disable(&cctx); } } diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c index d40edbcb1a..633485f647 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -504,7 +504,7 @@ ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, isc_result_t result; ns_interface_t *ifp = NULL; REQUIRE(ifpret != NULL && *ifpret == NULL); - REQUIRE(addr_in_use == NULL || *addr_in_use == false); + REQUIRE(addr_in_use == NULL || !*addr_in_use); result = ns_interface_create(mgr, addr, name, &ifp); if (result != ISC_R_SUCCESS) { @@ -882,7 +882,7 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) { return (result); } - if (adjusting == false) { + if (!adjusting) { result = clearacl(mgr->mctx, &mgr->aclenv.localhost); if (result != ISC_R_SUCCESS) { goto cleanup_iter; @@ -912,10 +912,10 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) { if (family != AF_INET && family != AF_INET6) { continue; } - if (scan_ipv4 == false && family == AF_INET) { + if (!scan_ipv4 && family == AF_INET) { continue; } - if (scan_ipv6 == false && family == AF_INET6) { + if (!scan_ipv6 && family == AF_INET6) { continue; } @@ -935,7 +935,7 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) { continue; } - if (adjusting == false) { + if (!adjusting) { /* * If running with -T fixedlocal, then we only * want 127.0.0.1 and ::1 in the localhost ACL. @@ -990,7 +990,7 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) { continue; } - if (adjusting == false && dolistenon) { + if (!adjusting && dolistenon) { setup_listenon(mgr, &interface, le->port); dolistenon = false; } @@ -1053,7 +1053,7 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) { } else { bool addr_in_use = false; - if (adjusting == false && ipv6_wildcard) { + if (!adjusting && ipv6_wildcard) { continue; } diff --git a/lib/ns/lib.c b/lib/ns/lib.c index 6d9d7c177c..4613b6432d 100644 --- a/lib/ns/lib.c +++ b/lib/ns/lib.c @@ -41,7 +41,7 @@ static isc_refcount_t references; static void initialize(void) { - REQUIRE(initialize_done == false); + REQUIRE(!initialize_done); isc_mem_create(&ns_g_mctx); diff --git a/lib/ns/query.c b/lib/ns/query.c index c36e6acd39..f4a8f30d64 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -5903,7 +5903,7 @@ ns_query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname, sigrdataset = NULL; } - if (client->query.timerset == false) { + if (!client->query.timerset) { ns_client_settimeout(client, 60); } diff --git a/lib/ns/update.c b/lib/ns/update.c index eaa6cb33cc..5cb67d852e 100644 --- a/lib/ns/update.c +++ b/lib/ns/update.c @@ -280,7 +280,7 @@ update_log(ns_client_t *client, dns_zone_t *zone, int level, const char *fmt, return; } - if (isc_log_wouldlog(ns_lctx, level) == false) { + if (!isc_log_wouldlog(ns_lctx, level)) { return; } diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c index 79f3cb7bb8..f35ec79679 100644 --- a/lib/ns/xfrout.c +++ b/lib/ns/xfrout.c @@ -1663,7 +1663,7 @@ xfrout_senddone(isc_nmhandle_t *handle, isc_result_t result, void *arg) { xfrout_maybe_destroy(xfr); } else if (result != ISC_R_SUCCESS) { xfrout_fail(xfr, result, "send"); - } else if (xfr->end_of_stream == false) { + } else if (!xfr->end_of_stream) { sendstream(xfr); } else { /* End of zone transfer stream. */ diff --git a/lib/samples/nsprobe.c b/lib/samples/nsprobe.c index ab46e6a448..6eb48460f6 100644 --- a/lib/samples/nsprobe.c +++ b/lib/samples/nsprobe.c @@ -997,7 +997,7 @@ probe_domain(struct probe_trans *trans) { char *cp; REQUIRE(trans != NULL); - REQUIRE(trans->inuse == false); + REQUIRE(!trans->inuse); REQUIRE(outstanding_probes < MAX_PROBES); /* Construct domain */ diff --git a/lib/samples/sample-async.c b/lib/samples/sample-async.c index eb7ac09bc8..a0f523b3ee 100644 --- a/lib/samples/sample-async.c +++ b/lib/samples/sample-async.c @@ -211,7 +211,7 @@ dispatch_query(struct query_trans *trans) { char *cp; REQUIRE(trans != NULL); - REQUIRE(trans->inuse == false); + REQUIRE(!trans->inuse); REQUIRE(ISC_LIST_EMPTY(trans->answerlist)); REQUIRE(outstanding_queries < MAX_QUERIES); @@ -395,7 +395,7 @@ main(int argc, char *argv[]) { /* Sanity check */ for (i = 0; i < MAX_QUERIES; i++) { - INSIST(query_array[i].inuse == false); + INSIST(!query_array[i].inuse); } /* Cleanup */