Commit 9c8529bc authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Squash error/warning about signed/unsigned comparison 

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

modules/proxy/mod_proxy_balancer.c

+6 −3
Changes for modules/proxy/mod_proxy_balancer.c: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -1332,18 +1332,21 @@ PROXY_DECLARE(apr_status_t) ap_proxy_update_members(proxy_balancer *b, server_re 
{

    proxy_worker **workers;

    int i;

    unsigned int index;

    int index;

    proxy_worker_shared *shm;

    if (b->s->wupdated <= b->wupdated)

        return APR_SUCCESS;

    /*

     * Look thru the list of workers in shm

     * and see which one(s) we are lacking

     * and see which one(s) we are lacking...

     * again, the cast to unsigned int is safe

     * since our upper limit is always max_workers

     * which is int.

     */

    for (index = 0; index < b->max_workers; index++) {

        int found;

        apr_status_t rv;

        if ((rv = storage->dptr(b->slot, index, (void *)&shm)) != APR_SUCCESS) {

        if ((rv = storage->dptr(b->slot, (unsigned int)index, (void *)&shm)) != APR_SUCCESS) {

            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "worker slotmem_dptr failed");

            return APR_EGENERAL;

        }