diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c index c88adb8550..e9ab4eb633 100644 --- a/bin/check/check-tool.c +++ b/bin/check/check-tool.c @@ -127,9 +127,7 @@ add(char *key, int value) { isc_symvalue_t symvalue; if (sym_mctx == NULL) { - result = isc_mem_create(0, 0, &sym_mctx); - if (result != ISC_R_SUCCESS) - return; + isc_mem_create(&sym_mctx); } if (symtab == NULL) { diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c index 2da105e52b..a0dea04667 100644 --- a/bin/check/named-checkconf.c +++ b/bin/check/named-checkconf.c @@ -585,7 +585,7 @@ main(int argc, char **argv) { } isc_commandline_reset = true; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); while ((c = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != EOF) { switch (c) { diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c index 11d494a2e3..de6bb94b8e 100644 --- a/bin/check/named-checkzone.c +++ b/bin/check/named-checkzone.c @@ -517,7 +517,7 @@ main(int argc, char **argv) { InitSockets(); #endif - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); if (!quiet) RUNTIME_CHECK(setup_logging(mctx, errout, &lctx) == ISC_R_SUCCESS); diff --git a/bin/confgen/ddns-confgen.c b/bin/confgen/ddns-confgen.c index 45603f0757..af5b0b3b65 100644 --- a/bin/confgen/ddns-confgen.c +++ b/bin/confgen/ddns-confgen.c @@ -207,7 +207,7 @@ main(int argc, char **argv) { /* Use canonical algorithm name */ algname = alg_totext(alg); - DO("create memory context", isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); if (keyname == NULL) { const char *suffix = NULL; diff --git a/bin/confgen/rndc-confgen.c b/bin/confgen/rndc-confgen.c index ad2536e0c8..30d4cf99e0 100644 --- a/bin/confgen/rndc-confgen.c +++ b/bin/confgen/rndc-confgen.c @@ -209,7 +209,7 @@ main(int argc, char **argv) { keysize = alg_bits(alg); algname = alg_totext(alg); - DO("create memory context", isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); isc_buffer_init(&key_txtbuffer, &key_txtsecret, sizeof(key_txtsecret)); generate_key(mctx, alg, keysize, &key_txtbuffer); diff --git a/bin/delv/delv.c b/bin/delv/delv.c index 78e0d15d8d..7155d4b299 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -1642,9 +1642,7 @@ main(int argc, char *argv[]) { if (result != ISC_R_SUCCESS) fatal("dns_lib_init failed: %d", result); - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) - fatal("failed to create mctx"); + isc_mem_create(&mctx); CHECK(isc_appctx_create(mctx, &actx)); CHECK(isc_taskmgr_createinctx(mctx, 1, 0, &taskmgr)); diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 3a21d6516f..62da6e3a73 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -1365,8 +1365,7 @@ setup_libs(void) { if (!have_ipv6 && !have_ipv4) fatal("can't find either v4 or v6 networking"); - result = isc_mem_create(0, 0, &mctx); - check_result(result, "isc_mem_create"); + isc_mem_create(&mctx); isc_mem_setname(mctx, "dig", NULL); result = isc_log_create(mctx, &lctx, &logconfig); diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c index 673442c4ae..9b362630fa 100644 --- a/bin/dnssec/dnssec-cds.c +++ b/bin/dnssec/dnssec-cds.c @@ -1074,10 +1074,7 @@ main(int argc, char *argv[]) { int ch; char *endp; - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) { - fatal("out of memory"); - } + isc_mem_create(&mctx); #if USE_PKCS11 pk11_result_register(); diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c index d6f44d8566..b598d91d0e 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c @@ -350,10 +350,7 @@ main(int argc, char **argv) { usage(); } - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) { - fatal("out of memory"); - } + isc_mem_create(&mctx); #if USE_PKCS11 pk11_result_register(); diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c index 494535bd10..c97bfe3624 100644 --- a/bin/dnssec/dnssec-importkey.c +++ b/bin/dnssec/dnssec-importkey.c @@ -300,9 +300,7 @@ main(int argc, char **argv) { if (argc == 1) usage(); - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) - fatal("out of memory"); + isc_mem_create(&mctx); #if USE_PKCS11 pk11_result_register(); diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c index 888d34bc09..e9dfe36f4f 100644 --- a/bin/dnssec/dnssec-keyfromlabel.c +++ b/bin/dnssec/dnssec-keyfromlabel.c @@ -163,7 +163,7 @@ main(int argc, char **argv) { if (argc == 1) usage(); - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); #if USE_PKCS11 pk11_result_register(); diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index 2fad3fb285..85362db2a1 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -259,7 +259,7 @@ main(int argc, char **argv) { } isc_commandline_reset = true; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); isc_stdtime_get(&now); diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c index cb4b2a2ce4..1d9fa1680a 100644 --- a/bin/dnssec/dnssec-revoke.c +++ b/bin/dnssec/dnssec-revoke.c @@ -88,9 +88,7 @@ main(int argc, char **argv) { if (argc == 1) usage(); - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) - fatal("Out of memory"); + isc_mem_create(&mctx); #if HAVE_PKCS11 pk11_result_register(); diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c index 654b96f6ce..bcf32c72b7 100644 --- a/bin/dnssec/dnssec-settime.c +++ b/bin/dnssec/dnssec-settime.c @@ -167,9 +167,7 @@ main(int argc, char **argv) { if (argc == 1) usage(); - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) - fatal("Out of memory"); + isc_mem_create(&mctx); setup_logging(mctx, &log); diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 56c85a0759..005e7fe810 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -3230,9 +3230,7 @@ main(int argc, char *argv[]) { check_result(isc_app_start(), "isc_app_start"); - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) - fatal("out of memory"); + isc_mem_create(&mctx); #if USE_PKCS11 pk11_result_register(); diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c index 420bf979b8..483577ef4f 100644 --- a/bin/dnssec/dnssec-verify.c +++ b/bin/dnssec/dnssec-verify.c @@ -209,9 +209,7 @@ main(int argc, char *argv[]) { isc_commandline_reset = true; check_result(isc_app_start(), "isc_app_start"); - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) - fatal("out of memory"); + isc_mem_create(&mctx); #if USE_PKCS11 pk11_result_register(); diff --git a/bin/named/main.c b/bin/named/main.c index 565dfe1253..de914870cc 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -1462,10 +1462,7 @@ main(int argc, char *argv[]) { named_g_chrootdir); } - result = isc_mem_create(0, 0, &named_g_mctx); - if (result != ISC_R_SUCCESS) - named_main_earlyfatal("isc_mem_create() failed: %s", - isc_result_totext(result)); + isc_mem_create(&named_g_mctx); isc_mem_setname(named_g_mctx, "main", NULL); setup(); diff --git a/bin/named/server.c b/bin/named/server.c index 9c3bd99e3c..5f9fdd21e2 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -4349,9 +4349,9 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * cache, for the main cache memory and the heap * memory. */ - CHECK(isc_mem_create(0, 0, &cmctx)); + isc_mem_create(&cmctx); isc_mem_setname(cmctx, "cache", NULL); - CHECK(isc_mem_create(0, 0, &hmctx)); + isc_mem_create(&hmctx); isc_mem_setname(hmctx, "cache_heap", NULL); CHECK(dns_cache_create(cmctx, hmctx, named_g_taskmgr, named_g_timermgr, view->rdclass, diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c index c1e2f8905b..3b3682e46d 100644 --- a/bin/named/unix/dlz_dlopen_driver.c +++ b/bin/named/unix/dlz_dlopen_driver.c @@ -225,9 +225,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[], return (ISC_R_FAILURE); } - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) - return (result); + isc_mem_create(&mctx); cd = isc_mem_get(mctx, sizeof(*cd)); memset(cd, 0, sizeof(*cd)); diff --git a/bin/named/win32/dlz_dlopen_driver.c b/bin/named/win32/dlz_dlopen_driver.c index d6dd10e67a..d981aaf585 100644 --- a/bin/named/win32/dlz_dlopen_driver.c +++ b/bin/named/win32/dlz_dlopen_driver.c @@ -224,7 +224,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[], return (ISC_R_FAILURE); } - isc_mem_create(0, 0, &mctx); + isc_mem_create(&mctx); cd = isc_mem_get(mctx, sizeof(*cd)); memset(cd, 0, sizeof(*cd)); diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 378a78d24e..f403095e6b 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -3269,8 +3269,7 @@ main(int argc, char **argv) { pre_parse_args(argc, argv); - result = isc_mem_create(0, 0, &gmctx); - check_result(result, "isc_mem_create"); + isc_mem_create(&gmctx); parse_args(argc, argv); diff --git a/bin/pkcs11/pkcs11-tokens.c b/bin/pkcs11/pkcs11-tokens.c index 6971084d6e..82584e1a84 100644 --- a/bin/pkcs11/pkcs11-tokens.c +++ b/bin/pkcs11/pkcs11-tokens.c @@ -65,10 +65,7 @@ main(int argc, char *argv[]) { exit(1); } - if (isc_mem_create(0, 0, &mctx) != ISC_R_SUCCESS) { - fprintf(stderr, "isc_mem_create() failed\n"); - exit(1); - } + isc_mem_create(&mctx); pk11_result_register(); diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index 6f9c9b307c..29733ca409 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -930,7 +930,7 @@ main(int argc, char **argv) { serial = isc_random32(); - DO("create memory context", isc_mem_create(0, 0, &rndc_mctx)); + isc_mem_create(&rndc_mctx); DO("create socket manager", isc_socketmgr_create(rndc_mctx, &socketmgr)); DO("create task manager", isc_taskmgr_create(rndc_mctx, 1, 0, &taskmgr)); DO("create task", isc_task_create(taskmgr, 0, &task)); diff --git a/bin/tests/cfg_test.c b/bin/tests/cfg_test.c index d16b3bd699..349c07eb1b 100644 --- a/bin/tests/cfg_test.c +++ b/bin/tests/cfg_test.c @@ -70,7 +70,7 @@ main(int argc, char **argv) { unsigned int zonetype = 0; unsigned int pflags = 0; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); result = isc_log_create(mctx, &lctx, &lcfg); check_result(result, "isc_log_create()"); diff --git a/bin/tests/makejournal.c b/bin/tests/makejournal.c index 7d206dddc8..95a6609bb3 100644 --- a/bin/tests/makejournal.c +++ b/bin/tests/makejournal.c @@ -96,7 +96,7 @@ main(int argc, char **argv) { journal = argv[4]; isc_mem_debugging |= ISC_MEM_DEBUGRECORD; - CHECK(isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); CHECK(dst_lib_init(mctx, NULL)); dst_active = true; diff --git a/bin/tests/optional/adb_test.c b/bin/tests/optional/adb_test.c index 0461d7d7d1..1dcdeff0fd 100644 --- a/bin/tests/optional/adb_test.c +++ b/bin/tests/optional/adb_test.c @@ -295,7 +295,7 @@ main(int argc, char **argv) { /* * EVERYTHING needs a memory context. */ - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); cmp = NULL; RUNTIME_CHECK(isc_mempool_create(mctx, sizeof(client_t), &cmp) diff --git a/bin/tests/optional/byaddr_test.c b/bin/tests/optional/byaddr_test.c index 1cd0e61661..b72f508708 100644 --- a/bin/tests/optional/byaddr_test.c +++ b/bin/tests/optional/byaddr_test.c @@ -87,7 +87,7 @@ main(int argc, char *argv[]) { dns_result_register(); mctx = NULL; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); while ((ch = isc_commandline_parse(argc, argv, "nvw:")) != -1) { switch (ch) { diff --git a/bin/tests/optional/byname_test.c b/bin/tests/optional/byname_test.c index 4299650ec0..ccff87a5fe 100644 --- a/bin/tests/optional/byname_test.c +++ b/bin/tests/optional/byname_test.c @@ -201,7 +201,7 @@ main(int argc, char *argv[]) { dns_result_register(); mctx = NULL; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); while ((ch = isc_commandline_parse(argc, argv, "d:vw:")) != -1) { switch (ch) { diff --git a/bin/tests/optional/db_test.c b/bin/tests/optional/db_test.c index b30e01ec54..af3dd9cc43 100644 --- a/bin/tests/optional/db_test.c +++ b/bin/tests/optional/db_test.c @@ -362,7 +362,7 @@ main(int argc, char *argv[]) { dns_result_register(); - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); RUNTIME_CHECK(dns_dbtable_create(mctx, dns_rdataclass_in, &dbtable) == ISC_R_SUCCESS); diff --git a/bin/tests/optional/gsstest.c b/bin/tests/optional/gsstest.c index 43742c839c..49f0a507d3 100644 --- a/bin/tests/optional/gsstest.c +++ b/bin/tests/optional/gsstest.c @@ -445,7 +445,7 @@ main(int argc, char *argv[]) { dns_result_register(); mctx = NULL; - RUNCHECK(isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); RUNCHECK(isc_log_create(mctx, &lctx, &lcfg)); isc_log_setcontext(lctx); diff --git a/bin/tests/optional/inter_test.c b/bin/tests/optional/inter_test.c index e6b08b4cef..a054eba31d 100644 --- a/bin/tests/optional/inter_test.c +++ b/bin/tests/optional/inter_test.c @@ -30,7 +30,7 @@ main(int argc, char **argv) { UNUSED(argc); UNUSED(argv); - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); result = isc_interfaceiter_create(mctx, &iter); if (result != ISC_R_SUCCESS) goto cleanup; diff --git a/bin/tests/optional/lex_test.c b/bin/tests/optional/lex_test.c index c6940255e9..93b4baa608 100644 --- a/bin/tests/optional/lex_test.c +++ b/bin/tests/optional/lex_test.c @@ -90,7 +90,7 @@ main(int argc, char *argv[]) { } } - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); RUNTIME_CHECK(isc_lex_create(mctx, 256, &lex) == ISC_R_SUCCESS); if (masterfile) { diff --git a/bin/tests/optional/log_test.c b/bin/tests/optional/log_test.c index d57bcf015a..23ee80323f 100644 --- a/bin/tests/optional/log_test.c +++ b/bin/tests/optional/log_test.c @@ -106,7 +106,7 @@ main(int argc, char **argv) { lctx = NULL; lcfg = NULL; - CHECK(isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); CHECK(isc_log_create(mctx, &lctx, &lcfg)); CHECK(isc_log_settag(lcfg, progname)); diff --git a/bin/tests/optional/master_test.c b/bin/tests/optional/master_test.c index 0054ab4a0f..7806ded6ec 100644 --- a/bin/tests/optional/master_test.c +++ b/bin/tests/optional/master_test.c @@ -57,7 +57,7 @@ main(int argc, char *argv[]) { UNUSED(argc); - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); if (argv[1]) { isc_buffer_init(&source, argv[1], strlen(argv[1])); diff --git a/bin/tests/optional/mempool_test.c b/bin/tests/optional/mempool_test.c index 3474856e32..bc359f41f3 100644 --- a/bin/tests/optional/mempool_test.c +++ b/bin/tests/optional/mempool_test.c @@ -31,7 +31,7 @@ main(int argc, char *argv[]) { isc_mutex_init(&lock); mctx = NULL; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); mp1 = NULL; RUNTIME_CHECK(isc_mempool_create(mctx, 24, &mp1) == ISC_R_SUCCESS); diff --git a/bin/tests/optional/nsecify.c b/bin/tests/optional/nsecify.c index e39da005d6..8a7f912812 100644 --- a/bin/tests/optional/nsecify.c +++ b/bin/tests/optional/nsecify.c @@ -186,12 +186,10 @@ nsecify(char *filename) { int main(int argc, char *argv[]) { int i; - isc_result_t result; dns_result_register(); - result = isc_mem_create(0, 0, &mctx); - check_result(result, "isc_mem_create()"); + isc_mem_create(&mctx); argc--; argv++; diff --git a/bin/tests/optional/ratelimiter_test.c b/bin/tests/optional/ratelimiter_test.c index 3e9df9b16d..5bb0f081a6 100644 --- a/bin/tests/optional/ratelimiter_test.c +++ b/bin/tests/optional/ratelimiter_test.c @@ -101,7 +101,7 @@ main(int argc, char *argv[]) { isc_app_start(); isc_interval_set(&linterval, 1, 0); - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); RUNTIME_CHECK(isc_taskmgr_create(mctx, 3, 0, &taskmgr) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_timermgr_create(mctx, &timermgr) == diff --git a/bin/tests/optional/rbt_test.c b/bin/tests/optional/rbt_test.c index 404c019778..0fdd5ab5e6 100644 --- a/bin/tests/optional/rbt_test.c +++ b/bin/tests/optional/rbt_test.c @@ -277,12 +277,7 @@ main(int argc, char **argv) { */ isc_mem_debugging = ISC_MEM_DEBUGRECORD; - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) { - printf("isc_mem_create: %s: exiting\n", - dns_result_totext(result)); - exit(1); - } + isc_mem_create(&mctx); result = dns_rbt_create(mctx, delete_name, NULL, &rbt); if (result != ISC_R_SUCCESS) { diff --git a/bin/tests/optional/shutdown_test.c b/bin/tests/optional/shutdown_test.c index 42b898c505..6c533dc992 100644 --- a/bin/tests/optional/shutdown_test.c +++ b/bin/tests/optional/shutdown_test.c @@ -178,9 +178,9 @@ main(int argc, char *argv[]) { printf("%u workers\n", workers); mctx = NULL; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); mctx2 = NULL; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx2) == ISC_R_SUCCESS); + isc_mem_create(&mctx2); RUNTIME_CHECK(isc_taskmgr_create(mctx, workers, 0, &task_manager) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_timermgr_create(mctx, &timer_manager) == diff --git a/bin/tests/optional/sig0_test.c b/bin/tests/optional/sig0_test.c index 5cf9dd8c86..175edd80cd 100644 --- a/bin/tests/optional/sig0_test.c +++ b/bin/tests/optional/sig0_test.c @@ -207,7 +207,7 @@ main(int argc, char *argv[]) { isc_mutex_init(&lock); mctx = NULL; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); while ((ch = isc_commandline_parse(argc, argv, "vp:")) != -1) { switch (ch) { diff --git a/bin/tests/optional/sock_test.c b/bin/tests/optional/sock_test.c index 96b9602292..15ea571c2c 100644 --- a/bin/tests/optional/sock_test.c +++ b/bin/tests/optional/sock_test.c @@ -286,7 +286,7 @@ main(int argc, char *argv[]) { * EVERYTHING needs a memory context. */ mctx = NULL; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); /* * The task manager is independent (other than memory context) diff --git a/bin/tests/optional/sym_test.c b/bin/tests/optional/sym_test.c index adf15adc23..aec15f25f4 100644 --- a/bin/tests/optional/sym_test.c +++ b/bin/tests/optional/sym_test.c @@ -59,7 +59,7 @@ main(int argc, char *argv[]) { } } - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); RUNTIME_CHECK(isc_symtab_create(mctx, 691, undefine_action, NULL, case_sensitive, &st) == ISC_R_SUCCESS); diff --git a/bin/tests/optional/task_test.c b/bin/tests/optional/task_test.c index 73daf55956..9a680c0cc7 100644 --- a/bin/tests/optional/task_test.c +++ b/bin/tests/optional/task_test.c @@ -77,7 +77,7 @@ main(int argc, char *argv[]) { workers = 2; printf("%u workers\n", workers); - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); RUNTIME_CHECK(isc_taskmgr_create(mctx, workers, 0, &manager) == ISC_R_SUCCESS); diff --git a/bin/tests/optional/timer_test.c b/bin/tests/optional/timer_test.c index a36eced82d..6122aca33e 100644 --- a/bin/tests/optional/timer_test.c +++ b/bin/tests/optional/timer_test.c @@ -107,7 +107,7 @@ main(int argc, char *argv[]) { workers = 2; printf("%u workers\n", workers); - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx1) == ISC_R_SUCCESS); + isc_mem_create(&mctx1); RUNTIME_CHECK(isc_taskmgr_create(mctx1, workers, 0, &manager) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_timermgr_create(mctx1, &timgr) == ISC_R_SUCCESS); diff --git a/bin/tests/optional/zone_test.c b/bin/tests/optional/zone_test.c index e9b07d9bc7..9a266e979e 100644 --- a/bin/tests/optional/zone_test.c +++ b/bin/tests/optional/zone_test.c @@ -280,7 +280,7 @@ main(int argc, char **argv) { usage(); RUNTIME_CHECK(isc_app_start() == ISC_R_SUCCESS); - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); RUNTIME_CHECK(isc_taskmgr_create(mctx, 2, 0, &taskmgr) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_timermgr_create(mctx, &timermgr) == ISC_R_SUCCESS); diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c index 828fac4127..f04b7f0c04 100644 --- a/bin/tests/system/pipelined/pipequeries.c +++ b/bin/tests/system/pipelined/pipequeries.c @@ -268,7 +268,7 @@ main(int argc, char *argv[]) { isc_sockaddr_fromin(&dstaddr, &inaddr, port); mctx = NULL; - RUNCHECK(isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); lctx = NULL; lcfg = NULL; diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c index 7533540e6d..d01d264832 100644 --- a/bin/tests/system/rsabigexponent/bigkey.c +++ b/bin/tests/system/rsabigexponent/bigkey.c @@ -101,7 +101,7 @@ main(int argc, char **argv) { dns_result_register(); - CHECK(isc_mem_create(0, 0, &mctx), "isc_mem_create()"); + isc_mem_create(&mctx); CHECK(dst_lib_init(mctx, NULL), "dst_lib_init()"); CHECK(isc_log_create(mctx, &log_, &logconfig), "isc_log_create()"); isc_log_setcontext(log_); diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c index f872d5e2c8..9ccb24ff32 100644 --- a/bin/tests/system/tkey/keycreate.c +++ b/bin/tests/system/tkey/keycreate.c @@ -227,7 +227,7 @@ main(int argc, char *argv[]) { mctx = NULL; isc_mem_debugging = ISC_MEM_DEBUGRECORD; - RUNCHECK(isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); log = NULL; logconfig = NULL; diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c index 0613f697a0..c96d38950c 100644 --- a/bin/tests/system/tkey/keydelete.c +++ b/bin/tests/system/tkey/keydelete.c @@ -166,7 +166,7 @@ main(int argc, char **argv) { dns_result_register(); mctx = NULL; - RUNCHECK(isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); log = NULL; logconfig = NULL; diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c index 7e3570fdd9..191c4507aa 100644 --- a/bin/tests/wire_test.c +++ b/bin/tests/wire_test.c @@ -132,7 +132,7 @@ main(int argc, char *argv[]) { } isc_commandline_reset = true; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); while ((ch = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) { switch (ch) { diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c index 94fc49a01c..77d964074b 100644 --- a/bin/tools/dnstap-read.c +++ b/bin/tools/dnstap-read.c @@ -342,7 +342,7 @@ main(int argc, char *argv[]) { if (argc < 1) fatal("no file specified"); - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); dns_result_register(); diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index 06870d51b1..29e2407705 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -2015,7 +2015,7 @@ main(int argc, char *argv[]) { preparse_args(argc, argv); mctx = NULL; - RUNCHECK(isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); lctx = NULL; lcfg = NULL; diff --git a/bin/tools/named-journalprint.c b/bin/tools/named-journalprint.c index 46af37ce0f..15d63aca98 100644 --- a/bin/tools/named-journalprint.c +++ b/bin/tools/named-journalprint.c @@ -67,7 +67,7 @@ main(int argc, char **argv) { file = argv[1]; - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); RUNTIME_CHECK(setup_logging(mctx, stderr, &lctx) == ISC_R_SUCCESS); result = dns_journal_print(mctx, file, stdout); diff --git a/bin/tools/named-rrchecker.c b/bin/tools/named-rrchecker.c index b80227baca..c9f9b4a595 100644 --- a/bin/tools/named-rrchecker.c +++ b/bin/tools/named-rrchecker.c @@ -146,7 +146,7 @@ main(int argc, char *argv[]) { if (doexit) exit(0); - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); RUNTIME_CHECK(isc_lex_create(mctx, 256, &lex) == ISC_R_SUCCESS); /* diff --git a/contrib/dlz/bin/dlzbdb/dlzbdb.c b/contrib/dlz/bin/dlzbdb/dlzbdb.c index c3cd51811e..d01a50a34b 100644 --- a/contrib/dlz/bin/dlzbdb/dlzbdb.c +++ b/contrib/dlz/bin/dlzbdb/dlzbdb.c @@ -668,11 +668,7 @@ open_lexer(void) { return ISC_R_SUCCESS; /* allocate memory for lexer, and verify it was allocated */ - result = isc_mem_create(0, 0, &lex_mctx); - if (result != ISC_R_SUCCESS) { - fprintf(stderr, "unexpected error creating lexer\n"); - return result; - } + isc_mem_create(&lex_mctx); /* create lexer */ result = isc_lex_create(lex_mctx, 1500, &lexer); diff --git a/fuzz/dns_rdata_fromwire_text.c b/fuzz/dns_rdata_fromwire_text.c index 628c71ed27..7b001f21f7 100644 --- a/fuzz/dns_rdata_fromwire_text.c +++ b/fuzz/dns_rdata_fromwire_text.c @@ -98,7 +98,7 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { rdtype = typelist[(*data++) % types]; size--; rdclass = classlist[(*data++) % classes]; size--; - CHECK(isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); CHECK(isc_lex_create(mctx, 64, &lex)); memset(specials, 0, sizeof(specials)); diff --git a/fuzz/fuzz.h b/fuzz/fuzz.h index 93b9b13d03..1db7b18f82 100644 --- a/fuzz/fuzz.h +++ b/fuzz/fuzz.h @@ -28,7 +28,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); static isc_mem_t *mctx = NULL; static void __attribute__((constructor)) init(void) { - RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); + isc_mem_create(&mctx); RUNTIME_CHECK(dst_lib_init(mctx, NULL) == ISC_R_SUCCESS); } diff --git a/lib/dns/client.c b/lib/dns/client.c index dd37900a71..3d17909132 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -413,9 +413,7 @@ dns_client_create(dns_client_t **clientp, unsigned int options) { unsigned int logdebuglevel = 0; #endif - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) - return (result); + isc_mem_create(&mctx); result = isc_appctx_create(mctx, &actx); if (result != ISC_R_SUCCESS) goto cleanup; diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c index a32bac2c56..7a4a01ea60 100644 --- a/lib/dns/dnstap.c +++ b/lib/dns/dnstap.c @@ -164,10 +164,9 @@ dt_init(void) { if (!dt_initialized) { int ret; - if (dt_mctx == NULL) - result = isc_mem_create(0, 0, &dt_mctx); - if (result != ISC_R_SUCCESS) - goto unlock; + if (dt_mctx == NULL) { + isc_mem_create(&dt_mctx); + } isc_mem_setname(dt_mctx, "dt", NULL); isc_mem_setdestroycheck(dt_mctx, false); @@ -177,7 +176,6 @@ dt_init(void) { else result = ISC_R_FAILURE; } -unlock: UNLOCK(&dt_mutex); return (result); diff --git a/lib/dns/geoip2.c b/lib/dns/geoip2.c index c2cd08a804..513e423fa5 100644 --- a/lib/dns/geoip2.c +++ b/lib/dns/geoip2.c @@ -108,10 +108,7 @@ state_key_init(void) { int ret; if (state_mctx == NULL) { - result = isc_mem_create(0, 0, &state_mctx); - } - if (result != ISC_R_SUCCESS) { - goto unlock; + isc_mem_create(&state_mctx); } isc_mem_setname(state_mctx, "geoip_state", NULL); isc_mem_setdestroycheck(state_mctx, false); @@ -123,7 +120,6 @@ state_key_init(void) { result = ISC_R_FAILURE; } } - unlock: UNLOCK(&key_mutex); } diff --git a/lib/dns/lib.c b/lib/dns/lib.c index e2b92a99d7..629d2151dc 100644 --- a/lib/dns/lib.c +++ b/lib/dns/lib.c @@ -54,9 +54,7 @@ initialize(void) { isc_refcount_init(&references, 0); - result = isc_mem_create(0, 0, &dns_g_mctx); - if (result != ISC_R_SUCCESS) - return; + isc_mem_create(&dns_g_mctx); dns_result_register(); result = dns_ecdb_register(dns_g_mctx, &dbimp); if (result != ISC_R_SUCCESS) diff --git a/lib/dns/name.c b/lib/dns/name.c index 03ec8f32c0..6e169bfa90 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -1299,10 +1299,9 @@ totext_filter_proc_key_init(void) { if (!thread_key_initialized) { LOCK(&thread_key_mutex); - if (thread_key_mctx == NULL) - result = isc_mem_create(0, 0, &thread_key_mctx); - if (result != ISC_R_SUCCESS) - goto unlock; + if (thread_key_mctx == NULL) { + isc_mem_create(&thread_key_mctx); + } isc_mem_setname(thread_key_mctx, "threadkey", NULL); isc_mem_setdestroycheck(thread_key_mctx, false); @@ -1311,9 +1310,9 @@ totext_filter_proc_key_init(void) { free_specific) != 0) { result = ISC_R_FAILURE; isc_mem_detach(&thread_key_mctx); - } else + } else { thread_key_initialized = 1; - unlock: + } UNLOCK(&thread_key_mutex); } return (result); diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index dc29bccf3c..06787c0d64 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -9977,12 +9977,7 @@ dns_resolver_create(dns_view_t *view, * contention among multiple threads. Do this only when * enabling threads because it will be require more memory. */ - result = isc_mem_create(0, 0, &res->buckets[i].mctx); - if (result != ISC_R_SUCCESS) { - isc_task_detach(&res->buckets[i].task); - isc_mutex_destroy(&res->buckets[i].lock); - goto cleanup_buckets; - } + isc_mem_create(&res->buckets[i].mctx); isc_mem_setname(res->buckets[i].mctx, name, NULL); isc_task_setname(res->buckets[i].task, name, res); ISC_LIST_INIT(res->buckets[i].fctxs); diff --git a/lib/dns/tests/db_test.c b/lib/dns/tests/db_test.c index 6738a53a1f..851df601cb 100644 --- a/lib/dns/tests/db_test.c +++ b/lib/dns/tests/db_test.c @@ -69,8 +69,7 @@ getoriginnode_test(void **state) { UNUSED(state); - result = isc_mem_create(0, 0, &mctx); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_create(&mctx); result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_zone, dns_rdataclass_in, 0, NULL, &db); @@ -98,8 +97,7 @@ getsetservestalettl_test(void **state) { UNUSED(state); - result = isc_mem_create(0, 0, &mctx); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_create(&mctx); result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_cache, dns_rdataclass_in, 0, NULL, &db); @@ -142,8 +140,7 @@ dns_dbfind_staleok_test(void **state) { UNUSED(state); - result = isc_mem_create(0, 0, &mctx); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_create(&mctx); result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_cache, dns_rdataclass_in, 0, NULL, &db); diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c index ce83df60a2..e1d877f59c 100644 --- a/lib/dns/tests/dnstest.c +++ b/lib/dns/tests/dnstest.c @@ -142,7 +142,7 @@ dns_test_begin(FILE *logfile, bool start_managers) { } INSIST(dt_mctx == NULL); - CHECK(isc_mem_create(0, 0, &dt_mctx)); + isc_mem_create(&dt_mctx); /* Don't check the memory leaks as they hide the assertions */ isc_mem_setdestroycheck(dt_mctx, false); diff --git a/lib/dns/view.c b/lib/dns/view.c index cf6550b29d..ce2ca2e096 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -778,11 +778,7 @@ dns_view_createresolver(dns_view_t *view, view->attributes &= ~DNS_VIEWATTR_RESSHUTDOWN; isc_refcount_increment(&view->weakrefs); - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) { - dns_resolver_shutdown(view->resolver); - return (result); - } + isc_mem_create(&mctx); result = dns_adb_create(mctx, view, timermgr, taskmgr, &view->adb); isc_mem_setname(mctx, "ADB", NULL); diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 24430e610a..1904c26dc6 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -16775,16 +16775,13 @@ dns_zonemgr_shutdown(dns_zonemgr_t *zmgr) { static isc_result_t mctxinit(void **target, void *arg) { - isc_result_t result; isc_mem_t *mctx = NULL; UNUSED(arg); REQUIRE(target != NULL && *target == NULL); - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) - return (result); + isc_mem_create(&mctx); isc_mem_setname(mctx, "zonemgr-pool", NULL); *target = mctx; diff --git a/lib/irs/context.c b/lib/irs/context.c index c9d4b7d4c3..a359c1ee89 100644 --- a/lib/irs/context.c +++ b/lib/irs/context.c @@ -93,9 +93,7 @@ ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp, { isc_result_t result; - result = isc_mem_create(0, 0, mctxp); - if (result != ISC_R_SUCCESS) - goto fail; + isc_mem_create(mctxp); result = isc_appctx_create(*mctxp, actxp); if (result != ISC_R_SUCCESS) diff --git a/lib/irs/tests/resconf_test.c b/lib/irs/tests/resconf_test.c index 81b601d52a..9b5a44ec6d 100644 --- a/lib/irs/tests/resconf_test.c +++ b/lib/irs/tests/resconf_test.c @@ -34,10 +34,7 @@ static isc_mem_t *mctx = NULL; static void setup_test() { - isc_result_t result; - - result = isc_mem_create(0, 0, &mctx); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_create(&mctx); /* * the caller might run from another directory, but tests diff --git a/lib/isc/tests/heap_test.c b/lib/isc/tests/heap_test.c index 9cc043152a..b0b8e64481 100644 --- a/lib/isc/tests/heap_test.c +++ b/lib/isc/tests/heap_test.c @@ -58,8 +58,7 @@ isc_heap_delete_test(void **state) { UNUSED(state); - result = isc_mem_create(0, 0, &mctx); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_create(&mctx); result = isc_heap_create(mctx, compare, idx, 0, &heap); assert_int_equal(result, ISC_R_SUCCESS); diff --git a/lib/isc/tests/ht_test.c b/lib/isc/tests/ht_test.c index ff7446cce1..9129365912 100644 --- a/lib/isc/tests/ht_test.c +++ b/lib/isc/tests/ht_test.c @@ -53,9 +53,8 @@ test_ht_full(int bits, uintptr_t count) { isc_mem_t *mctx = NULL; uintptr_t i; - result = isc_mem_createx(0, 0, default_memalloc, default_memfree, - NULL, &mctx, 0); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_createx(default_memalloc, default_memfree, + NULL, &mctx, 0); result = isc_ht_init(&ht, mctx, bits); assert_int_equal(result, ISC_R_SUCCESS); @@ -207,9 +206,8 @@ test_ht_iterator() { unsigned char key[16]; size_t tksize; - result = isc_mem_createx(0, 0, default_memalloc, default_memfree, - NULL, &mctx, 0); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_createx(default_memalloc, default_memfree, + NULL, &mctx, 0); result = isc_ht_init(&ht, mctx, 16); assert_int_equal(result, ISC_R_SUCCESS); diff --git a/lib/isc/tests/isctest.c b/lib/isc/tests/isctest.c index 6878354a73..ed5801b56e 100644 --- a/lib/isc/tests/isctest.c +++ b/lib/isc/tests/isctest.c @@ -109,7 +109,7 @@ isc_test_begin(FILE *logfile, bool start_managers, isc_mem_debugging |= ISC_MEM_DEBUGRECORD; INSIST(mctx == NULL); - CHECK(isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); if (logfile != NULL) { isc_logdestination_t destination; diff --git a/lib/isc/tests/lex_test.c b/lib/isc/tests/lex_test.c index ab44d15162..462375ae93 100644 --- a/lib/isc/tests/lex_test.c +++ b/lib/isc/tests/lex_test.c @@ -41,8 +41,7 @@ lex_0xff(void **state) { UNUSED(state); - result = isc_mem_create(0, 0, &mctx); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_create(&mctx); result = isc_lex_create(mctx, 1024, &lex); assert_int_equal(result, ISC_R_SUCCESS); @@ -75,8 +74,7 @@ lex_setline(void **state) { UNUSED(state); - result = isc_mem_create(0, 0, &mctx); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_create(&mctx); result = isc_lex_create(mctx, 1024, &lex); assert_int_equal(result, ISC_R_SUCCESS); diff --git a/lib/isc/tests/mem_test.c b/lib/isc/tests/mem_test.c index 0181b02ae8..74c0fdf1fb 100644 --- a/lib/isc/tests/mem_test.c +++ b/lib/isc/tests/mem_test.c @@ -95,8 +95,7 @@ isc_mem_test(void **state) { UNUSED(state); - result = isc_mem_create(0, 0, &localmctx); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_create(&localmctx); result = isc_mempool_create(localmctx, 24, &mp1); assert_int_equal(result, ISC_R_SUCCESS); @@ -169,10 +168,9 @@ isc_mem_test(void **state) { isc_mem_destroy(&localmctx); - result = isc_mem_createx(0, 0, default_memalloc, default_memfree, - NULL, &localmctx, - ISC_MEMFLAG_FILL | ISC_MEMFLAG_INTERNAL); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_createx(default_memalloc, default_memfree, + NULL, &localmctx, + ISC_MEMFLAG_FILL | ISC_MEMFLAG_INTERNAL); result = isc_mempool_create(localmctx, 2, &mp1); assert_int_equal(result, ISC_R_SUCCESS); @@ -191,7 +189,6 @@ isc_mem_test(void **state) { /* test TotalUse calculation */ static void isc_mem_total_test(void **state) { - isc_result_t result; isc_mem_t *mctx2 = NULL; size_t before, after; ssize_t diff; @@ -201,11 +198,8 @@ isc_mem_total_test(void **state) { /* Local alloc, free */ mctx2 = NULL; - result = isc_mem_createx(0, 0, default_memalloc, default_memfree, + isc_mem_createx(default_memalloc, default_memfree, NULL, &mctx2, 0); - if (result != ISC_R_SUCCESS) { - goto out; - } before = isc_mem_total(mctx2); @@ -239,17 +233,12 @@ isc_mem_total_test(void **state) { /* 2048 +8 bytes extra for size_info */ assert_int_equal(diff, (2048 + 8) * 100000); - out: - if (mctx2 != NULL) { - isc_mem_destroy(&mctx2); - } - + isc_mem_destroy(&mctx2); } /* test InUse calculation */ static void isc_mem_inuse_test(void **state) { - isc_result_t result; isc_mem_t *mctx2 = NULL; size_t before, after; ssize_t diff; @@ -258,11 +247,8 @@ isc_mem_inuse_test(void **state) { UNUSED(state); mctx2 = NULL; - result = isc_mem_createx(0, 0, default_memalloc, default_memfree, - NULL, &mctx2, 0); - if (result != ISC_R_SUCCESS) { - goto out; - } + isc_mem_createx(default_memalloc, default_memfree, + NULL, &mctx2, 0); before = isc_mem_inuse(mctx2); ptr = isc_mem_allocate(mctx2, 1024000); @@ -273,11 +259,7 @@ isc_mem_inuse_test(void **state) { assert_int_equal(diff, 0); - out: - if (mctx2 != NULL) { - isc_mem_destroy(&mctx2); - } - + isc_mem_destroy(&mctx2); } #if ISC_MEM_TRACKLINES @@ -296,9 +278,8 @@ isc_mem_noflags_test(void **state) { UNUSED(state); - result = isc_mem_createx(0, 0, default_memalloc, default_memfree, - NULL, &mctx2, 0); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_createx(default_memalloc, default_memfree, + NULL, &mctx2, 0); isc_mem_debugging = 0; ptr = isc_mem_get(mctx2, 2048); assert_non_null(ptr); @@ -343,9 +324,8 @@ isc_mem_recordflag_test(void **state) { UNUSED(state); - result = isc_mem_createx(0, 0, default_memalloc, default_memfree, - NULL, &mctx2, 0); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_createx(default_memalloc, default_memfree, + NULL, &mctx2, 0); ptr = isc_mem_get(mctx2, 2048); assert_non_null(ptr); isc__mem_printactive(mctx2, f); @@ -388,10 +368,9 @@ isc_mem_traceflag_test(void **state) { UNUSED(state); - result = isc_mem_createx(0, 0, default_memalloc, default_memfree, - NULL, &mctx2, 0); + isc_mem_createx(default_memalloc, default_memfree, + NULL, &mctx2, 0); isc_mem_debugging = ISC_MEM_DEBUGTRACE; - assert_int_equal(result, ISC_R_SUCCESS); ptr = isc_mem_get(mctx2, 2048); assert_non_null(ptr); isc__mem_printactive(mctx2, f); diff --git a/lib/isc/tests/random_test.c b/lib/isc/tests/random_test.c index 56f37ce025..c3877d9655 100644 --- a/lib/isc/tests/random_test.c +++ b/lib/isc/tests/random_test.c @@ -273,7 +273,6 @@ matrix_binaryrank(uint32_t *bits, size_t rows, size_t cols) { static void random_test(pvalue_func_t *func, isc_random_func test_func) { isc_mem_t *mctx = NULL; - isc_result_t result; uint32_t m; uint32_t j; uint32_t histogram[11] = { 0 }; @@ -287,8 +286,7 @@ random_test(pvalue_func_t *func, isc_random_func test_func) { tables_init(); - result = isc_mem_create(0, 0, &mctx); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_create(&mctx); m = 1000; passed = 0; diff --git a/lib/isc/tests/task_test.c b/lib/isc/tests/task_test.c index 9a0b902e22..a47eb9ba36 100644 --- a/lib/isc/tests/task_test.c +++ b/lib/isc/tests/task_test.c @@ -708,8 +708,7 @@ manytasks(void **state) { isc_condition_init(&cv); isc_mem_debugging = ISC_MEM_DEBUGRECORD; - result = isc_mem_create(0, 0, &mctx); - assert_int_equal(result, ISC_R_SUCCESS); + isc_mem_create(&mctx); result = isc_taskmgr_create(mctx, 4, 0, &taskmgr); assert_int_equal(result, ISC_R_SUCCESS); diff --git a/lib/isccfg/tests/parser_test.c b/lib/isccfg/tests/parser_test.c index d684c6b268..84e6e5fd03 100644 --- a/lib/isccfg/tests/parser_test.c +++ b/lib/isccfg/tests/parser_test.c @@ -71,7 +71,7 @@ setup() { isc_result_t result; isc_mem_debugging |= ISC_MEM_DEBUGRECORD; - CHECK(isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); isc_logdestination_t destination; isc_logconfig_t *logconfig = NULL; diff --git a/lib/ns/client.c b/lib/ns/client.c index 4cad159a48..cac10a4c4d 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -3043,7 +3043,6 @@ client_timeout(isc_task_t *task, isc_event_t *event) { static isc_result_t get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) { isc_mem_t *clientmctx; - isc_result_t result; #if NMCTXS > 0 unsigned int nextmctx; #endif @@ -3054,10 +3053,9 @@ get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) { * Caller must be holding the manager lock. */ if ((manager->sctx->options & NS_SERVER_CLIENTTEST) != 0) { - result = isc_mem_create(0, 0, mctxp); - if (result == ISC_R_SUCCESS) - isc_mem_setname(*mctxp, "client", NULL); - return (result); + isc_mem_create(mctxp); + isc_mem_setname(*mctxp, "client", NULL); + return (ISC_R_SUCCESS); } #if NMCTXS > 0 nextmctx = manager->nextmctx++; @@ -3068,9 +3066,7 @@ get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) { clientmctx = manager->mctxpool[nextmctx]; if (clientmctx == NULL) { - result = isc_mem_create(0, 0, &clientmctx); - if (result != ISC_R_SUCCESS) - return (result); + isc_mem_create(&clientmctx); isc_mem_setname(clientmctx, "client", NULL); manager->mctxpool[nextmctx] = clientmctx; diff --git a/lib/ns/lib.c b/lib/ns/lib.c index 66e9025c06..c4c3fe6266 100644 --- a/lib/ns/lib.c +++ b/lib/ns/lib.c @@ -43,13 +43,9 @@ static isc_refcount_t references; static void initialize(void) { - isc_result_t result; - REQUIRE(initialize_done == false); - result = isc_mem_create(0, 0, &ns_g_mctx); - if (result != ISC_R_SUCCESS) - return; + isc_mem_create(&ns_g_mctx); isc_refcount_init(&references, 0); initialize_done = true; diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c index 99d12205d1..e2ff80785e 100644 --- a/lib/ns/tests/nstest.c +++ b/lib/ns/tests/nstest.c @@ -237,7 +237,7 @@ ns_test_begin(FILE *logfile, bool start_managers) { } INSIST(mctx == NULL); - CHECK(isc_mem_create(0, 0, &mctx)); + isc_mem_create(&mctx); if (!dst_active) { CHECK(dst_lib_init(mctx, NULL)); diff --git a/lib/samples/nsprobe.c b/lib/samples/nsprobe.c index c672fb0705..0ca51dd718 100644 --- a/lib/samples/nsprobe.c +++ b/lib/samples/nsprobe.c @@ -215,9 +215,7 @@ ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp, { isc_result_t result; - result = isc_mem_create(0, 0, mctxp); - if (result != ISC_R_SUCCESS) - goto fail; + isc_mem_create(mctxp); result = isc_appctx_create(*mctxp, actxp); if (result != ISC_R_SUCCESS) diff --git a/lib/samples/resolve.c b/lib/samples/resolve.c index c2620d318f..1715c5c89e 100644 --- a/lib/samples/resolve.c +++ b/lib/samples/resolve.c @@ -113,11 +113,7 @@ set_key(dns_client_t *client, char *keynamestr, char *keystr, isc_region_t r; dns_secalg_t alg; - result = isc_mem_create(0, 0, mctxp); - if (result != ISC_R_SUCCESS) { - fprintf(stderr, "failed to create mctx\n"); - exit(1); - } + isc_mem_create(mctxp); if (algname != NULL) { tr.base = algname; @@ -367,11 +363,7 @@ main(int argc, char *argv[]) { exit(1); } - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) { - fprintf(stderr, "failed to crate mctx\n"); - exit(1); - } + isc_mem_create(&mctx); result = isc_appctx_create(mctx, &actx); if (result != ISC_R_SUCCESS) diff --git a/lib/samples/sample-async.c b/lib/samples/sample-async.c index 2d577a3ec5..cda22185fe 100644 --- a/lib/samples/sample-async.c +++ b/lib/samples/sample-async.c @@ -97,9 +97,7 @@ ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp, { isc_result_t result; - result = isc_mem_create(0, 0, mctxp); - if (result != ISC_R_SUCCESS) - goto fail; + isc_mem_create(mctxp); result = isc_appctx_create(*mctxp, actxp); if (result != ISC_R_SUCCESS) diff --git a/lib/samples/sample-request.c b/lib/samples/sample-request.c index 90e0827655..b053f39322 100644 --- a/lib/samples/sample-request.c +++ b/lib/samples/sample-request.c @@ -188,11 +188,7 @@ main(int argc, char *argv[]) { qmessage = NULL; rmessage = NULL; - result = isc_mem_create(0, 0, &mctx); - if (result != ISC_R_SUCCESS) { - fprintf(stderr, "failed to create a memory context\n"); - exit(1); - } + isc_mem_create(&mctx); result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER, &qmessage); if (result == ISC_R_SUCCESS) { result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, diff --git a/lib/samples/sample-update.c b/lib/samples/sample-update.c index 6d47ab9d1f..9fa50c136d 100644 --- a/lib/samples/sample-update.c +++ b/lib/samples/sample-update.c @@ -240,11 +240,7 @@ main(int argc, char *argv[]) { fprintf(stderr, "dns_lib_init failed: %u\n", result); exit(1); } - result = isc_mem_create(0, 0, &umctx); - if (result != ISC_R_SUCCESS) { - fprintf(stderr, "failed to crate mctx\n"); - exit(1); - } + isc_mem_create(&umctx); result = dns_client_create(&client, 0); if (result != ISC_R_SUCCESS) {