From: Ryan Bloom <rbb@apache.org>
Date: Tue, 19 Dec 2000 20:44:24 +0000 (+0000)
Subject: ap_start_shutdown is not used by anybody outside of the MPMs, so we don't
X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~398
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98a20231fc34db0ab2be2faba5a4ba913ac00665;p=apache

ap_start_shutdown is not used by anybody outside of the MPMs, so we don't
need to put it in the ap_mpm.h header file.  This also makes all of the
instances of ap_start_shutdown static.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87428 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/ap_mpm.h b/include/ap_mpm.h
index 491eb6370f..1e1914b21c 100644
--- a/include/ap_mpm.h
+++ b/include/ap_mpm.h
@@ -125,22 +125,6 @@ AP_DECLARE(int) ap_mpm_run(apr_pool_t *pconf, apr_pool_t *plog, server_rec *serv
  */
 AP_DECLARE(int) ap_graceful_stop_signalled(void);
 
-/**
- * ap_start_shutdown() and ap_start_restart() is a function to initiate 
- * shutdown without relying on signals. 
- *
- * This should only be called from the parent process itself, since the
- * parent process will use the shutdown_pending and restart_pending variables
- * to determine whether to shutdown or restart. The child process should
- * call signal_parent() directly to tell the parent to die -- this will
- * cause neither of those variable to be set, which the parent will
- * assume means something serious is wrong (which it will be, for the
- * child to force an exit) and so do an exit anyway.
- * @deffunc void ap_start_shutdown(void)
- */
-
-AP_DECLARE(void) ap_start_shutdown(void);
-
 /**
  * Spawn a process with privileges that another module has requested
  * @param r The request_rec of the current request
diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 495eb5b3e2..d9e3037734 100644
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -197,7 +197,7 @@ static int volatile is_graceful;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
 	/* Um, is this _probably_ not an error, if the user has
diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 9f63a44d19..21de8db305 100644
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -234,7 +234,7 @@ static int volatile is_graceful;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
 	/* Um, is this _probably_ not an error, if the user has
diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 286430e59c..cdce784c45 100644
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -272,7 +272,7 @@ static int volatile is_graceful;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
 	/* Um, is this _probably_ not an error, if the user has
diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index 3f62b40e7d..3f907c2bd4 100644
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -203,7 +203,7 @@ static int volatile is_graceful;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
 	/* Um, is this _probably_ not an error, if the user has
diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index e43440c993..56a6bec9a1 100644
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -231,7 +231,7 @@ ap_generation_t volatile ap_my_generation;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
 	/* Um, is this _probably_ not an error, if the user has
diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index 286430e59c..cdce784c45 100644
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -272,7 +272,7 @@ static int volatile is_graceful;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
 	/* Um, is this _probably_ not an error, if the user has