From: Evan Hunt <each@isc.org>
Date: Fri, 19 Oct 2018 06:59:18 +0000 (-0700)
Subject: remove references to methods and app_api.c
X-Git-Tag: v9.13.4~112^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f35ab856746db4f3649ae7e3ca7e4f511a3ebdd;p=thirdparty%2Fbind9.git

remove references to methods and app_api.c
---

diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
index ea691d41271..5705a44efb2 100644
--- a/lib/isc/unix/app.c
+++ b/lib/isc/unix/app.c
@@ -449,10 +449,12 @@ isc_app_ctxrun(isc_appctx_t *ctx0) {
 isc_result_t
 isc_app_run(void) {
 	isc_result_t result;
+
 	is_running = true;
 	result = isc_app_ctxrun((isc_appctx_t *)&isc_g_appctx);
 	is_running = false;
-	return result;
+
+	return (result);
 }
 
 bool
diff --git a/lib/isc/win32/app.c b/lib/isc/win32/app.c
index 299374dff51..ae4c0154131 100644
--- a/lib/isc/win32/app.c
+++ b/lib/isc/win32/app.c
@@ -123,7 +123,6 @@ isc_result_t
 isc_app_start(void) {
 	isc_g_appctx.common.impmagic = APPCTX_MAGIC;
 	isc_g_appctx.common.magic = ISCAPI_APPCTX_MAGIC;
-	isc_g_appctx.common.methods = &appmethods.methods;
 	isc_g_appctx.mctx = NULL;
 	/* The remaining members will be initialized in ctxstart() */
 
@@ -370,7 +369,6 @@ isc_appctx_create(isc_mem_t *mctx, isc_appctx_t **ctxp) {
 
 	ctx->common.impmagic = APPCTX_MAGIC;
 	ctx->common.magic = ISCAPI_APPCTX_MAGIC;
-	ctx->common.methods = &appmethods.methods;
 
 	ctx->mctx = NULL;
 	isc_mem_attach(mctx, &ctx->mctx);
@@ -423,5 +421,3 @@ isc_appctx_settimermgr(isc_appctx_t *ctx0, isc_timermgr_t *timermgr) {
 
 	ctx->timermgr = timermgr;
 }
-
-#include "../app_api.c"