mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

Refactor dns_adb_create() to return void

Browse Source 
After isc_stats_create() change, the dns_adb_create() cannot fail, so
refactor the function to return void and fix all its uses.
This commit is contained in:
Ondřej Surý 2023-06-26 11:04:33 +02:00 committed by Ondřej Surý
parent 5321c474ea
commit 045d8d9ed6
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/dns/adb.c
View File

@ -1960,7 +1960,7 @@ ISC_REFCOUNT_IMPL(dns_adb, destroy);
* Public functions.
*/
isc_result_t
void
dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_loopmgr_t *loopmgr,
dns_adb_t **newadb) {
dns_adb_t *adb = NULL;
@ -2012,7 +2012,6 @@ dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_loopmgr_t *loopmgr,
*/
adb->magic = DNS_ADB_MAGIC;
*newadb = adb;
return (ISC_R_SUCCESS);
}
void

7
lib/dns/include/dns/adb.h
View File

@ -250,7 +250,7 @@ struct dns_adbaddrinfo {
**** FUNCTIONS
****/
isc_result_t
void
dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_loopmgr_t *loopmgr,
dns_adb_t **newadb);
/*%<
@ -270,11 +270,6 @@ dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_loopmgr_t *loopmgr,
*\li 'loopmgr' be a valid loop manager.
*
*\li 'newadb' != NULL && '*newadb' == NULL.
*
* Returns:
*
*\li #ISC_R_SUCCESS after happiness.
*\li #ISC_R_NOMEMORY after resource allocation failure.
*/
#if DNS_ADB_TRACE

6
lib/dns/view.c
View File

@ -619,11 +619,8 @@ dns_view_createresolver(dns_view_t *view, isc_loopmgr_t *loopmgr,
isc_mem_create(&mctx);
isc_mem_setname(mctx, "ADB");
result = dns_adb_create(mctx, view, loopmgr, &view->adb);
dns_adb_create(mctx, view, loopmgr, &view->adb);
isc_mem_detach(&mctx);
if (result != ISC_R_SUCCESS) {
goto cleanup_resolver;
}
result = dns_requestmgr_create(view->mctx, view->dispatchmgr,
dispatchv4, dispatchv6,
@ -638,7 +635,6 @@ cleanup_adb:
dns_adb_shutdown(view->adb);
dns_adb_detach(&view->adb);
cleanup_resolver:
dns_resolver_shutdown(view->resolver);
dns_resolver_detach(&view->resolver);