From 6773b801b6314037669f093b0e1bdbe2f51220d8 Mon Sep 17 00:00:00 2001 From: David Reid Date: Wed, 9 Aug 2000 10:23:49 +0000 Subject: [PATCH] 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 --- server/mpm/beos/beos.c | 7 ++++--- server/mpm/beos/scoreboard.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c index 6cc2405505..ac8c997878 100644 --- 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 e4af0ed611..c7907f47e2 100644 --- 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; -- 2.40.0