Refactor ns_server_create() to return void

After isc_stats_create() change, the ns_server_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:09:26 +02:00 committed by Ondřej Surý
parent ea2fe8eea4
commit bf44554889
4 changed files with 4 additions and 7 deletions

View file

@ -2139,7 +2139,7 @@ run_server(void *arg) {
RUNTIME_CHECK(inet_pton(AF_INET, "127.0.0.1", &in));
isc_sockaddr_fromin(&addr, &in, 0);
CHECK(ns_server_create(mctx, matchview, &sctx));
ns_server_create(mctx, matchview, &sctx);
CHECK(dns_dispatchmgr_create(mctx, netmgr, &dispatchmgr));
isc_sockaddr_any(&any);

View file

@ -10136,8 +10136,7 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) {
atomic_init(&server->reload_status, NAMED_RELOAD_IN_PROGRESS);
CHECKFATAL(ns_server_create(mctx, get_matching_view, &server->sctx),
"creating server context");
ns_server_create(mctx, get_matching_view, &server->sctx);
#if defined(HAVE_GEOIP2)
/*

View file

@ -133,7 +133,7 @@ struct ns_altsecret {
unsigned char secret[32];
};
isc_result_t
void
ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview,
ns_server_t **sctxp);
/*%<

View file

@ -35,7 +35,7 @@
RUNTIME_CHECK(result == ISC_R_SUCCESS); \
} while (0)
isc_result_t
void
ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview,
ns_server_t **sctxp) {
ns_server_t *sctx;
@ -100,8 +100,6 @@ ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview,
sctx->magic = SCTX_MAGIC;
*sctxp = sctx;
return (ISC_R_SUCCESS);
}
void