From 3388ef36b3cff409f78db59cc1c5d71839423ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Mon, 19 Apr 2021 10:20:43 +0200
Subject: [PATCH] Cleanup the isc_<*>mgr_createinc() constructors

Previously, the taskmgr, timermgr and socketmgr had a constructor
variant, that would create the mgr on top of existing appctx.  This was
no longer true and isc_<*>mgr was just calling isc_<*>mgr_create()
directly without any extra code.

This commit just cleans up the extra function.
---
 bin/delv/delv.c              |  6 +++---
 bin/tests/system/resolve.c   |  6 +++---
 lib/isc/include/isc/socket.h |  5 -----
 lib/isc/include/isc/task.h   |  8 +-------
 lib/isc/include/isc/timer.h  |  8 +-------
 lib/isc/task.c               | 12 ------------
 lib/isc/timer.c              |  9 ---------
 lib/isc/unix/socket.c        |  9 ---------
 lib/isc/win32/libisc.def.in  |  3 ---
 lib/isc/win32/socket.c       |  9 ---------
 10 files changed, 8 insertions(+), 67 deletions(-)

diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index ae8433f24e..79addc0254 100644
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -1759,9 +1759,9 @@ main(int argc, char *argv[]) {
 	isc_mem_create(&mctx);
 
 	CHECK(isc_appctx_create(mctx, &actx));
-	CHECK(isc_taskmgr_createinctx(mctx, 1, 0, &taskmgr));
-	CHECK(isc_socketmgr_createinctx(mctx, &socketmgr));
-	CHECK(isc_timermgr_createinctx(mctx, &timermgr));
+	CHECK(isc_taskmgr_create(mctx, 1, 0, NULL, &taskmgr));
+	CHECK(isc_socketmgr_create(mctx, &socketmgr));
+	CHECK(isc_timermgr_create(mctx, &timermgr));
 
 	parse_args(argc, argv);
 
diff --git a/bin/tests/system/resolve.c b/bin/tests/system/resolve.c
index bd2a947a8c..88f95986c3 100644
--- a/bin/tests/system/resolve.c
+++ b/bin/tests/system/resolve.c
@@ -371,15 +371,15 @@ main(int argc, char *argv[]) {
 	if (result != ISC_R_SUCCESS) {
 		goto cleanup;
 	}
-	result = isc_taskmgr_createinctx(mctx, 1, 0, &taskmgr);
+	result = isc_taskmgr_create(mctx, 1, 0, NULL, &taskmgr);
 	if (result != ISC_R_SUCCESS) {
 		goto cleanup;
 	}
-	result = isc_socketmgr_createinctx(mctx, &socketmgr);
+	result = isc_socketmgr_create(mctx, &socketmgr);
 	if (result != ISC_R_SUCCESS) {
 		goto cleanup;
 	}
-	result = isc_timermgr_createinctx(mctx, &timermgr);
+	result = isc_timermgr_create(mctx, &timermgr);
 	if (result != ISC_R_SUCCESS) {
 		goto cleanup;
 	}
diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 0888ca6f2d..db2a4156a5 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -715,9 +715,6 @@ isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region, isc_task_t *task,
  */
 /*@}*/
 
-isc_result_t
-isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp);
-
 isc_result_t
 isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp);
 
@@ -729,8 +726,6 @@ isc_socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp,
  * maximum number of sockets that the created manager should handle.
  * isc_socketmgr_create() is equivalent of isc_socketmgr_create2() with
  * "maxsocks" being zero.
- * isc_socketmgr_createinctx() also associates the new manager with the
- * specified application context.
  *
  * Notes:
  *
diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index 397d1150f9..bd9dd5bab3 100644
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -640,16 +640,12 @@ isc_task_privilege(isc_task_t *task);
 ***** Task Manager.
 *****/
 
-isc_result_t
-isc_taskmgr_createinctx(isc_mem_t *mctx, unsigned int workers,
-			unsigned int default_quantum, isc_taskmgr_t **managerp);
 isc_result_t
 isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
 		   unsigned int default_quantum, isc_nm_t *nm,
 		   isc_taskmgr_t **managerp);
 /*%<
- * Create a new task manager.  isc_taskmgr_createinctx() also associates
- * the new manager with the specified application context.
+ * Create a new task manager.
  *
  * Notes:
  *
@@ -674,8 +670,6 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
  *
  *\li	managerp != NULL && *managerp == NULL
  *
- *\li	'actx' is a valid application context (for createinctx()).
- *
  * Ensures:
  *
  *\li	On success, '*managerp' will be attached to the newly created task
diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h
index a31a0c4729..dc8da8a720 100644
--- a/lib/isc/include/isc/timer.h
+++ b/lib/isc/include/isc/timer.h
@@ -306,14 +306,10 @@ isc_timer_gettype(isc_timer_t *timer);
  *\li	'timer' to be a valid timer.
  */
 
-isc_result_t
-isc_timermgr_createinctx(isc_mem_t *mctx, isc_timermgr_t **managerp);
-
 isc_result_t
 isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp);
 /*%<
- * Create a timer manager.  isc_timermgr_createinctx() also associates
- * the new manager with the specified application context.
+ * Create a timer manager.
  *
  * Notes:
  *
@@ -325,8 +321,6 @@ isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp);
  *
  *\li	'managerp' points to a NULL isc_timermgr_t.
  *
- *\li	'actx' is a valid application context (for createinctx()).
- *
  * Ensures:
  *
  *\li	'*managerp' is a valid isc_timermgr_t.
diff --git a/lib/isc/task.c b/lib/isc/task.c
index a618d5b65b..49ca897577 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -2015,15 +2015,3 @@ error:
 	return (result);
 }
 #endif /* ifdef HAVE_JSON_C */
-
-isc_result_t
-isc_taskmgr_createinctx(isc_mem_t *mctx, unsigned int workers,
-			unsigned int default_quantum,
-			isc_taskmgr_t **managerp) {
-	isc_result_t result;
-
-	result = isc_taskmgr_create(mctx, workers, default_quantum, NULL,
-				    managerp);
-
-	return (result);
-}
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 95981cc27a..48a900d223 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -770,12 +770,3 @@ isc_timermgr_destroy(isc_timermgr_t **managerp) {
 
 	*managerp = NULL;
 }
-
-isc_result_t
-isc_timermgr_createinctx(isc_mem_t *mctx, isc_timermgr_t **managerp) {
-	isc_result_t result;
-
-	result = isc_timermgr_create(mctx, managerp);
-
-	return (result);
-}
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 6f02dd0141..a05bab0710 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -5554,12 +5554,3 @@ error:
 	return (result);
 }
 #endif /* HAVE_JSON_C */
-
-isc_result_t
-isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
-	isc_result_t result;
-
-	result = isc_socketmgr_create(mctx, managerp);
-
-	return (result);
-}
diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in
index 6bfc93d7f9..6889fb4f0e 100644
--- a/lib/isc/win32/libisc.def.in
+++ b/lib/isc/win32/libisc.def.in
@@ -591,7 +591,6 @@ isc_sockaddr_setport
 isc_sockaddr_totext
 isc_sockaddr_v6fromin
 isc_socket_socketevent
-isc_socketmgr_createinctx
 isc_socketmgr_maxudp
 @IF NOTYET
 isc_socketmgr_renderjson
@@ -653,7 +652,6 @@ isc_task_shutdown
 isc_task_unpause
 isc_task_unsend
 isc_taskmgr_create
-isc_taskmgr_createinctx
 isc_taskmgr_destroy
 isc_taskmgr_excltask
 isc_taskmgr_mode
@@ -706,7 +704,6 @@ isc_timer_gettype
 isc_timer_reset
 isc_timer_touch
 isc_timermgr_create
-isc_timermgr_createinctx
 isc_timermgr_destroy
 isc_timermgr_poke
 isc_tls_get_http2_alpn
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 42d345cd82..8964964102 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -3955,15 +3955,6 @@ error:
 }
 #endif /* HAVE_JSON_C */
 
-isc_result_t
-isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
-	isc_result_t result;
-
-	result = isc_socketmgr_create(mctx, managerp);
-
-	return (result);
-}
-
 void
 isc_socketmgr_maxudp(isc_socketmgr_t *manager, unsigned int maxudp) {
 	REQUIRE(VALID_MANAGER(manager));