From: Jim Jagielski <jim@apache.org>
Date: Thu, 5 Mar 2015 18:39:55 +0000 (+0000)
Subject: Move statics
X-Git-Tag: 2.5.0-alpha~3407
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e45efc0e3cc95699cb221bf6b1863f9e543886bc;p=apache

Move statics

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

diff --git a/server/mpm/motorz/motorz.c b/server/mpm/motorz/motorz.c
index 2aaf74dfa2..866a278376 100644
--- a/server/mpm/motorz/motorz.c
+++ b/server/mpm/motorz/motorz.c
@@ -16,6 +16,43 @@
 
 #include "motorz.h"
 
+/**
+ * config globals
+ */
+static motorz_core_t *g_motorz_core;
+static int threads_per_child = 0;
+static int ap_num_kids=0;
+static int ap_daemons_min_free=0;
+static int ap_daemons_max_free=0;
+static int ap_daemons_limit=0;      /* MaxRequestWorkers */
+static int server_limit = 0;
+static int mpm_state = AP_MPMQ_STARTING;
+
+/* one_process --- debugging mode variable; can be set from the command line
+ * with the -X flag.  If set, this gets you the child_main loop running
+ * in the process which originally started up (no detach, no make_child),
+ * which is a pretty nice debugging environment.  (You'll get a SIGHUP
+ * early in standalone_main; just continue through.  This is the server
+ * trying to kill off any child processes which it might have lying
+ * around --- Apache doesn't keep track of their pids, it just sends
+ * SIGHUP to the process group, ignoring it in the root process.
+ * Continue through and you'll be fine.).
+ */
+static int one_process = 0;
+
+static apr_pool_t *pconf;               /* Pool for config stuff */
+static apr_pool_t *pchild;              /* Pool for httpd child stuff */
+
+static pid_t ap_my_pid; /* it seems silly to call getpid all the time */
+static pid_t parent_pid;
+static int my_child_num;
+static int num_buckets; /* Number of listeners buckets */
+static motorz_child_bucket *all_buckets, /* All listeners buckets */
+                            *my_bucket;   /* Current child bucket */
+
+static void clean_child_exit(int code) __attribute__ ((noreturn));
+
+
 static apr_status_t motorz_io_process(motorz_conn_t *scon);
 static void clean_child_exit(int code) __attribute__ ((noreturn));
 
diff --git a/server/mpm/motorz/motorz.h b/server/mpm/motorz/motorz.h
index 7612427e71..8f6fd463fb 100644
--- a/server/mpm/motorz/motorz.h
+++ b/server/mpm/motorz/motorz.h
@@ -132,7 +132,6 @@ struct motorz_core_t {
     apr_skiplist *timer_ring;
     apr_thread_pool_t *workers;
 };
-static motorz_core_t *g_motorz_core;
 
 typedef struct motorz_child_bucket motorz_child_bucket;
 struct motorz_child_bucket {
@@ -185,41 +184,3 @@ struct motorz_conn_t
     /** public parts of the connection state */
     conn_state_t cs;
 };
-
-
-/**
- * config globals
- */
-
-static int threads_per_child = 0;
-static int ap_num_kids=0;
-static int ap_daemons_min_free=0;
-static int ap_daemons_max_free=0;
-static int ap_daemons_limit=0;      /* MaxRequestWorkers */
-static int server_limit = 0;
-static int mpm_state = AP_MPMQ_STARTING;
-
-/* one_process --- debugging mode variable; can be set from the command line
- * with the -X flag.  If set, this gets you the child_main loop running
- * in the process which originally started up (no detach, no make_child),
- * which is a pretty nice debugging environment.  (You'll get a SIGHUP
- * early in standalone_main; just continue through.  This is the server
- * trying to kill off any child processes which it might have lying
- * around --- Apache doesn't keep track of their pids, it just sends
- * SIGHUP to the process group, ignoring it in the root process.
- * Continue through and you'll be fine.).
- */
-static int one_process = 0;
-
-static apr_pool_t *pconf;               /* Pool for config stuff */
-static apr_pool_t *pchild;              /* Pool for httpd child stuff */
-
-static pid_t ap_my_pid; /* it seems silly to call getpid all the time */
-static pid_t parent_pid;
-static int my_child_num;
-static int num_buckets; /* Number of listeners buckets */
-static motorz_child_bucket *all_buckets, /* All listeners buckets */
-                            *my_bucket;   /* Current child bucket */
-
-static void clean_child_exit(int code) __attribute__ ((noreturn));
-