Some tidying up of the beos mpm.

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

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 6cc2405505fdd465e760c3f3e94eedcded283b8d..ac8c997878edec1d680b57edb8a89ca9192b8fcf 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -442,8 +442,9 @@ static int32 worker_thread(void * dummy)
         }
     got_fd:
         if (!this_worker_should_exit) {
+            rv = apr_accept(&csd, sd, ptrans);
             apr_unlock(accept_mutex);
-            if ((rv = apr_accept(&csd, sd, ptrans)) != APR_SUCCESS) {
+            if (rv != APR_SUCCESS) {
                 ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf,
                   "apr_accept");
             } else {
@@ -591,7 +592,7 @@ static void perform_idle_server_maintenance(void)
 static void server_main_loop(int remaining_threads_to_start)
 {
     int child_slot;
-    apr_wait_t status;
+    ap_wait_t status;
     apr_proc_t pid;
     int i;
 
@@ -599,7 +600,7 @@ static void server_main_loop(int remaining_threads_to_start)
         ap_wait_or_timeout(&status, &pid, pconf);
          
         if (pid.pid >= 0) {
-            ap_process_child_status(pid.pid, status);
+            ap_process_child_status(&pid, status);
             /* non-fatal death... note that it's gone in the scoreboard. */
             child_slot = -1;
             for (i = 0; i < ap_max_child_assigned; ++i) {

diff --git a/server/mpm/beos/scoreboard.c b/server/mpm/beos/scoreboard.c
index e4af0ed61148d9d80f69b602db2c0df82f574ef4..c7907f47e29372df4609149977fc967a7038c138 100644 (file)
--- a/server/mpm/beos/scoreboard.c
+++ b/server/mpm/beos/scoreboard.c
@@ -191,7 +191,7 @@ apr_array_header_t *ap_get_connection_keys(apr_pool_t *p, long conn_id)
             break;
         }
         array_slot = apr_push_array(key_list);
-        *array_slot = apr_pstrdup(p, ss->key);
+        *array_slot = (char*)apr_pstrdup(p, ss->key);
         i++;
     }
     return key_list;