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.

diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index d33facdec5067c7af39a23ff203ead32f581db3b..d045bfaa8ced4bfe28e586d6a2615ebf38f8d288 100644 (file)
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -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);

diff --git a/bin/named/server.c b/bin/named/server.c
index ca4a5b3260c242bf580ed85e93474a0a8d74a71e..cbcba3d28d548e552826e47df7c53a05dcf38ca9 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -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)
        /*

diff --git a/lib/ns/include/ns/server.h b/lib/ns/include/ns/server.h
index 8dc8b1cf3e7b8719c5f99bbcf3603a9622752131..84003bf57f924372ddf44d7d34d56ccbd0feb50e 100644 (file)
--- a/lib/ns/include/ns/server.h
+++ b/lib/ns/include/ns/server.h
@@ -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);
 /*%<

diff --git a/lib/ns/server.c b/lib/ns/server.c
index 8ef62544682354196b53e8bd11fb6fed4e0f1e20..bd17a9baaa6ad106ee487e8eb0fdf751a211fad7 100644 (file)
--- a/lib/ns/server.c
+++ b/lib/ns/server.c
@@ -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