Commit 2bb3c90e authored by Aaron Bannert's avatar Aaron Bannert
Browse files

Convert tabs to spaces, and a couple other style changes. No functional 

changes. I checked with the rewrite.t perl-framework test to make sure
it still passes.


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

modules/mappers/mod_rewrite.c

+153 −150
Original line number Diff line number Diff line
@@ -2352,7 +2352,8 @@ static void do_expand(request_rec *r, char *input, char *buffer, int nbuf, 
                result = lookup_map(r, map, xkey);

                if (result) {

                    span = apr_cpystrn(outp, result, space) - outp;

		} else {

                }

                else {

                    do_expand(r, dflt, xdflt, sizeof(xdflt), briRR, briRC);

                    span = apr_cpystrn(outp, xdflt, space) - outp;

                }
@@ -2383,8 +2384,8 @@ static void do_expand(request_rec *r, char *input, char *buffer, int nbuf, 
                bri = briRC;

            }

            /* see ap_pregsub() in src/main/util.c */

            if (bri && n <= bri->nsub &&

		bri->regmatch[n].rm_eo > bri->regmatch[n].rm_so) {

            if (bri && n <= bri->nsub

                && bri->regmatch[n].rm_eo > bri->regmatch[n].rm_so) {

                span = bri->regmatch[n].rm_eo - bri->regmatch[n].rm_so;

                if (span > space) {

                    span = space;
@@ -3662,8 +3663,9 @@ static cache *init_cache(apr_pool_t *p) 
    cache *c;



    c = (cache *)apr_palloc(p, sizeof(cache));

    if (apr_pool_create(&c->pool, p) != APR_SUCCESS)

    if (apr_pool_create(&c->pool, p) != APR_SUCCESS) {

        return NULL;

    }

    c->lists = apr_array_make(c->pool, 2, sizeof(cachelist));

#if APR_HAS_THREADS

    (void)apr_lock_create(&(c->lock), APR_MUTEX, APR_INTRAPROCESS, NULL, p);
@@ -4040,9 +4042,10 @@ static int subreq_ok(request_rec *r) 
     * either not in a subrequest, or in a subrequest

     * and URIs aren't NULL and sub/main URIs differ

     */

    return (r->main == NULL ||

	    (r->main->uri != NULL && r->uri != NULL &&

	     strcmp(r->main->uri, r->uri) != 0));

    return (r->main == NULL

            || (r->main->uri != NULL

                && r->uri != NULL

                && strcmp(r->main->uri, r->uri) != 0));

}