summaryrefslogtreecommitdiffstats
path: root/server/mpm/prefork
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2001-11-11 06:17:51 +0100
committerJeff Trawick <trawick@apache.org>2001-11-11 06:17:51 +0100
commitfd7c16969e2bea7c8a90d9563222e7b357bafb56 (patch)
tree2be00577e8d32b4364c612eaaf00cba93af151c6 /server/mpm/prefork
parentin prefork, listensocks[0] doesn't have a pod (diff)
downloadapache2-fd7c16969e2bea7c8a90d9563222e7b357bafb56.tar.xz
apache2-fd7c16969e2bea7c8a90d9563222e7b357bafb56.zip
minor tweaks to pass a parm of the right type to apr_poll() and
to use i for an iterator in both listensocks[] loops git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91850 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/prefork')
-rw-r--r--server/mpm/prefork/prefork.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 6f686ca1c3..c20c9e4ab6 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -544,7 +544,7 @@ static void child_main(int child_num_arg)
apr_pool_t *ptrans;
conn_rec *current_conn;
apr_status_t stat = APR_EINIT;
- int sockdes, i, n;
+ int sockdes, i;
ap_listen_rec *lr;
int curr_pollfd, last_pollfd = 0;
apr_pollfd_t *pollset;
@@ -583,8 +583,8 @@ static void child_main(int child_num_arg)
listensocks[i]=lr->sd;
apr_poll_setup(&pollset, num_listensocks, pchild);
- for(n=0 ; n < num_listensocks ; n++)
- apr_poll_socket_add(pollset, listensocks[n], APR_POLLIN);
+ for (i = 0; i < num_listensocks; i++)
+ apr_poll_socket_add(pollset, listensocks[i], APR_POLLIN);
while (!die_now) {
/*
@@ -612,6 +612,7 @@ static void child_main(int child_num_arg)
for (;;) {
apr_status_t ret;
apr_int16_t event;
+ apr_int32_t n;
ret = apr_poll(pollset, &n, -1);
if (ret != APR_SUCCESS) {