From: Jim Jagielski <jim@apache.org>
Date: Thu, 5 Mar 2015 18:16:47 +0000 (+0000)
Subject: Fix errors and mistakenly removed rets
X-Git-Tag: 2.5.0-alpha~3408
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d8f15ae04f66e89e1cb6c29c12eaa31727ce371;p=apache

Fix errors and mistakenly removed rets

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

diff --git a/server/mpm/motorz/motorz.c b/server/mpm/motorz/motorz.c
index 2bf61e77ad..2aaf74dfa2 100644
--- a/server/mpm/motorz/motorz.c
+++ b/server/mpm/motorz/motorz.c
@@ -116,6 +116,7 @@ static void *motorz_io_setup_conn(apr_thread_t * thread, void *baton)
         ap_log_error(APLOG_MARK, APLOG_DEBUG, status, ap_server_conf, APLOGNO()
                      "motorz_io_setup_conn: motorz_io_process failed (?)");
     }
+    return NULL;
 }
 
 static apr_status_t motorz_io_user(motorz_core_t *mz, motorz_sb_t *sb)
@@ -168,6 +169,7 @@ static void *motorz_timer_invoke(apr_thread_t *thread, void *baton)
     motorz_timer_t *ep = (motorz_timer_t *)baton;
     
     motorz_timer_run(ep);
+    return NULL;
 }
 
 static void *motorz_io_invoke(apr_thread_t * thread, void *baton)
@@ -184,6 +186,7 @@ static void *motorz_io_invoke(apr_thread_t * thread, void *baton)
         ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, ap_server_conf, APLOGNO()
                      "motorz_io_invoke: motorz_io_process failed (?)");
     }
+    return NULL;
 }
 
 static apr_status_t motorz_io_event_process(motorz_core_t *mz, motorz_sb_t *sb)
@@ -1084,9 +1087,9 @@ static int motorz_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     int index;
     int remaining_children_to_start;
     int i;
+    motorz_core_t *mz = motorz_core_get();
 
     ap_log_pid(pconf, ap_pid_fname);
-    motorz_core_t *mz = motorz_core_get();
 
     if (!mz->is_graceful) {
         if (ap_run_pre_mpm(s->process->pool, SB_SHARED) != OK) {
@@ -1400,8 +1403,8 @@ static int motorz_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
     char id[16];
     int i;
 
-    pconf = p;
     motorz_core_t *mz = motorz_core_get();
+    pconf = p;
 
     /* the reverse of pre_config, we want this only the first time around */
     if (mz->module_loads == 1) {