From: Jeff Trawick <trawick@apache.org>
Date: Sun, 11 Nov 2001 05:17:51 +0000 (+0000)
Subject: minor tweaks to pass a parm of the right type to apr_poll() and
X-Git-Tag: 2.0.29~189
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd7c16969e2bea7c8a90d9563222e7b357bafb56;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 6f686ca1c35..c20c9e4ab60 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) {