perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tors...@apache.org
Subject svn commit: r671881 - in /perl/modperl/branches/threading: src/modules/perl/ xs/APR/Pool/ xs/APR/Socket/ xs/Apache2/Directive/ xs/Apache2/RequestRec/
Date Thu, 26 Jun 2008 12:37:25 GMT
Author: torsten
Date: Thu Jun 26 05:37:25 2008
New Revision: 671881

URL: http://svn.apache.org/viewvc?rev=671881&view=rev
Log:
expand tabs in C files

Modified:
    perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c
    perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c
    perl/modperl/branches/threading/src/modules/perl/modperl_config.c
    perl/modperl/branches/threading/src/modules/perl/modperl_config.h
    perl/modperl/branches/threading/src/modules/perl/modperl_interp.c
    perl/modperl/branches/threading/src/modules/perl/modperl_io.c
    perl/modperl/branches/threading/src/modules/perl/modperl_module.c
    perl/modperl/branches/threading/src/modules/perl/modperl_svptr_table.c
    perl/modperl/branches/threading/src/modules/perl/modperl_util.c
    perl/modperl/branches/threading/src/modules/perl/modperl_util.h
    perl/modperl/branches/threading/xs/APR/Pool/APR__Pool.h
    perl/modperl/branches/threading/xs/APR/Socket/APR__Socket.h
    perl/modperl/branches/threading/xs/Apache2/Directive/Apache2__Directive.h
    perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c Thu Jun 26 05:37:25 2008
@@ -557,7 +557,7 @@
     }
 
     MP_TRACE_i(MP_FUNC, "using interp %lx to execute perl section:\n%s",
-	       scfg->mip->parent, arg);
+               scfg->mip->parent, arg);
 
     {
         SV *server = MP_PERLSECTIONS_SERVER_SV;

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c Thu Jun 26 05:37:25
2008
@@ -51,9 +51,9 @@
 
     if (modperl_threaded_mpm()) {
         apr_file_printf(logfile, "[%lu/%lu] ", (unsigned long)getpid(),
-			modperl_threads_started()
-			? (unsigned long)apr_os_thread_current()
-			: 0);
+                        modperl_threads_started()
+                        ? (unsigned long)apr_os_thread_current()
+                        : 0);
     }
     else {
         apr_file_printf(logfile, "[%lu] ", (unsigned long)getpid());

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_config.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_config.c?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_config.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_config.c Thu Jun 26 05:37:25
2008
@@ -381,7 +381,7 @@
     modperl_interp_t *interp = modperl_interp_select(r, NULL, r->server);
 
     MP_TRACE_i(MP_FUNC, "just selected: (0x%lx)->refcnt=%ld",
-	       interp, interp->refcnt);
+               interp, interp->refcnt);
     aTHX = interp->perl;
 #endif
 
@@ -389,7 +389,7 @@
 
 #ifdef USE_ITHREADS
     MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld",
-	       interp, interp->refcnt);
+               interp, interp->refcnt);
     modperl_interp_unselect(interp);
 #endif
 

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_config.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_config.h?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_config.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_config.h Thu Jun 26 05:37:25
2008
@@ -48,9 +48,9 @@
  */
 #define modperl_config_req_cleanup_register(r, rcfg)           \
     if (r && !MpReqCLEANUP_REGISTERED(rcfg)) {                 \
-        apr_pool_t *p;					       \
-        apr_pool_create(&p, r->pool);			       \
-        apr_pool_cleanup_register(p,			       \
+        apr_pool_t *p;                                         \
+        apr_pool_create(&p, r->pool);                          \
+        apr_pool_cleanup_register(p,                           \
                                   (void*)r,                    \
                                   modperl_config_req_cleanup,  \
                                   apr_pool_cleanup_null);      \

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_interp.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_interp.c?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_interp.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_interp.c Thu Jun 26 05:37:25
2008
@@ -272,7 +272,7 @@
 static apr_status_t modperl_interp_pool_cleanup(void *data)
 {
     MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
-	       data, ((modperl_interp_t*)data)->refcnt);
+               data, ((modperl_interp_t*)data)->refcnt);
 
     return modperl_interp_unselect(data);
 }
@@ -287,7 +287,7 @@
 
     ap_assert(interp && MpInterpIN_USE(interp));
     MP_TRACE_i(MP_FUNC, "unselect(interp=0x%lx): refcnt=%d\n",
-	       (unsigned long)interp, interp->refcnt);
+               (unsigned long)interp, interp->refcnt);
     if (interp->refcnt != 0) {
         --interp->refcnt;
         MP_TRACE_i(MP_FUNC, "interp=0x%lx, refcnt=%d -- interp still in use\n",
@@ -303,7 +303,7 @@
     modperl_tipool_putback_data(mip->tipool, data, interp->num_requests);
 
     MP_TRACE_i(MP_FUNC, "interp=0x%lx freed, tipool(size=%ld, in_use=%ld)\n",
-	       (unsigned long)interp, mip->tipool->size, mip->tipool->in_use);
+               (unsigned long)interp, mip->tipool->size, mip->tipool->in_use);
 
     return APR_SUCCESS;
 }
@@ -349,57 +349,57 @@
     modperl_interp_t *interp = NULL;
 
     if (is_startup) {
-	if (scfg) {
-	    MP_TRACE_i(MP_FUNC, "using parent interpreter at startup\n");
+        if (scfg) {
+            MP_TRACE_i(MP_FUNC, "using parent interpreter at startup\n");
 
-	    if (!scfg->mip) {
-		/* we get here if directive handlers are invoked
-		 * before server merge.
-		 */
-		modperl_init_vhost(s, p, NULL);
-	    }
-
-	    interp = scfg->mip->parent;
-	}
-	else {
-	    if (!(interp = modperl_interp_pool_get(p))) {
-		interp = modperl_interp_get(s);
-		modperl_interp_pool_set(p, interp);
-
-		MP_TRACE_i(MP_FUNC, "set interp 0x%lx in pconf pool 0x%lx\n",
-			   (unsigned long)interp, (unsigned long)p);
-	    }
-	    else {
-		MP_TRACE_i(MP_FUNC, "found interp 0x%lx in pconf pool 0x%lx\n",
-			   (unsigned long)interp, (unsigned long)p);
-	    }
-	}
-
-	/* set context (THX) for this thread */
-	PERL_SET_CONTEXT(interp->perl);
-	/* let the perl interpreter point back to its interp */
-	MP_THX_INTERP_SET(interp->perl, interp);
+            if (!scfg->mip) {
+                /* we get here if directive handlers are invoked
+                 * before server merge.
+                 */
+                modperl_init_vhost(s, p, NULL);
+            }
 
-	return interp;
+            interp = scfg->mip->parent;
+        }
+        else {
+            if (!(interp = modperl_interp_pool_get(p))) {
+                interp = modperl_interp_get(s);
+                modperl_interp_pool_set(p, interp);
+
+                MP_TRACE_i(MP_FUNC, "set interp 0x%lx in pconf pool 0x%lx\n",
+                           (unsigned long)interp, (unsigned long)p);
+            }
+            else {
+                MP_TRACE_i(MP_FUNC, "found interp 0x%lx in pconf pool 0x%lx\n",
+                           (unsigned long)interp, (unsigned long)p);
+            }
+        }
+
+        /* set context (THX) for this thread */
+        PERL_SET_CONTEXT(interp->perl);
+        /* let the perl interpreter point back to its interp */
+        MP_THX_INTERP_SET(interp->perl, interp);
+
+        return interp;
     }
     else if (!modperl_threaded_mpm()) {
-	MP_TRACE_i(MP_FUNC, "using parent interpreter in non-threaded mode\n");
+        MP_TRACE_i(MP_FUNC, "using parent interpreter in non-threaded mode\n");
 
-	/* since we are not running in threaded mode PERL_SET_CONTEXT
-	 * is not necessary */
-	/* PERL_SET_CONTEXT(scfg->mip->parent->perl); */
-	/* let the perl interpreter point back to its interp */
-	MP_THX_INTERP_SET(scfg->mip->parent->perl, scfg->mip->parent);
+        /* since we are not running in threaded mode PERL_SET_CONTEXT
+         * is not necessary */
+        /* PERL_SET_CONTEXT(scfg->mip->parent->perl); */
+        /* let the perl interpreter point back to its interp */
+        MP_THX_INTERP_SET(scfg->mip->parent->perl, scfg->mip->parent);
 
-	return scfg->mip->parent;
+        return scfg->mip->parent;
     }
     else {
-	request_rec *r;
-	apr_pool_userdata_get((void **)&r, "MODPERL_R", p);
-	ap_assert(r);
-	MP_TRACE_i(MP_FUNC, "found userdata MODPERL_R in pool %#lx as %lx\n",
-		   (unsigned long)r->pool, (unsigned long)r);
-	return modperl_interp_select(r, NULL, s);
+        request_rec *r;
+        apr_pool_userdata_get((void **)&r, "MODPERL_R", p);
+        ap_assert(r);
+        MP_TRACE_i(MP_FUNC, "found userdata MODPERL_R in pool %#lx as %lx\n",
+                   (unsigned long)r->pool, (unsigned long)r);
+        return modperl_interp_select(r, NULL, s);
     }
 }
 
@@ -420,9 +420,9 @@
                    (unsigned long)scfg->mip->parent,
                    s->server_hostname, s->port);
         /* XXX: if no VirtualHosts w/ PerlOptions +Parent we can skip this */
-	PERL_SET_CONTEXT(scfg->mip->parent->perl);
-	/* let the perl interpreter point back to its interp */
-	MP_THX_INTERP_SET(scfg->mip->parent->perl, scfg->mip->parent);
+        PERL_SET_CONTEXT(scfg->mip->parent->perl);
+        /* let the perl interpreter point back to its interp */
+        MP_THX_INTERP_SET(scfg->mip->parent->perl, scfg->mip->parent);
         return scfg->mip->parent;
     }
 
@@ -435,11 +435,11 @@
         MP_TRACE_i(MP_FUNC,
                    "found interp 0x%lx in con config, refcnt incremented to %d\n",
                    (unsigned long)ccfg->interp, ccfg->interp->refcnt);
-	/* set context (THX) for this thread */
-	PERL_SET_CONTEXT(ccfg->interp->perl);
-	/* MP_THX_INTERP_SET is not called here because the interp
-	 * already belongs to the perl interpreter
-	 */
+        /* set context (THX) for this thread */
+        PERL_SET_CONTEXT(ccfg->interp->perl);
+        /* MP_THX_INTERP_SET is not called here because the interp
+         * already belongs to the perl interpreter
+         */
         return ccfg->interp;
     }
 
@@ -458,8 +458,8 @@
     interp->ccfg = ccfg;
 
     MP_TRACE_i(MP_FUNC,
-	       "pulled interp 0x%lx from mip, num_requests is %d\n",
-	       (unsigned long)interp, interp->num_requests);
+               "pulled interp 0x%lx from mip, num_requests is %d\n",
+               (unsigned long)interp, interp->num_requests);
 
     /*
      * if a per-dir PerlInterpScope is specified, use it.
@@ -475,47 +475,47 @@
                modperl_interp_scope_desc(scope));
 
     if (scope != MP_INTERP_SCOPE_HANDLER) {
-	desc = NULL;
+        desc = NULL;
         if (c && (scope == MP_INTERP_SCOPE_CONNECTION || !r)) {
-	    p = c->pool;
-	    desc = "connection";
-	}
-	else if (r) {
-	    request_rec *main_r = r->main;
-
-	    if (main_r && (scope == MP_INTERP_SCOPE_REQUEST)) {
-		/* share 1 interpreter across sub-requests */
-		for(; main_r; main_r = main_r->main) {
-		    p = main_r->pool;
-		}
-		desc = "main request";
-	    }
-	    else {
-		p = r->pool;
-		desc = scope == MP_INTERP_SCOPE_REQUEST
+            p = c->pool;
+            desc = "connection";
+        }
+        else if (r) {
+            request_rec *main_r = r->main;
+
+            if (main_r && (scope == MP_INTERP_SCOPE_REQUEST)) {
+                /* share 1 interpreter across sub-requests */
+                for(; main_r; main_r = main_r->main) {
+                    p = main_r->pool;
+                }
+                desc = "main request";
+            }
+            else {
+                p = r->pool;
+                desc = scope == MP_INTERP_SCOPE_REQUEST
                        ? "main request"
-		       : "sub request";
-	    }
-	}
+                       : "sub request";
+            }
+        }
 
-	ap_assert(p);
+        ap_assert(p);
 
 #ifdef MP_TRACE
-	apr_pool_cleanup_register(p, (void *)interp,
-				  modperl_interp_pool_cleanup,
-				  modperl_interp_pool_cleanup);
+        apr_pool_cleanup_register(p, (void *)interp,
+                                  modperl_interp_pool_cleanup,
+                                  modperl_interp_pool_cleanup);
 #else
-	apr_pool_cleanup_register(p, (void *)interp,
-				  modperl_interp_unselect,
-				  modperl_interp_unselect);
+        apr_pool_cleanup_register(p, (void *)interp,
+                                  modperl_interp_unselect,
+                                  modperl_interp_unselect);
 #endif
 
-	/* add a reference for the registered cleanup */
-	interp->refcnt++;
+        /* add a reference for the registered cleanup */
+        interp->refcnt++;
 
-	MP_TRACE_i(MP_FUNC,
-		   "registered unselect cleanup for interp 0x%lx in %s\n",
-		   (unsigned long)interp, desc);
+        MP_TRACE_i(MP_FUNC,
+                   "registered unselect cleanup for interp 0x%lx in %s\n",
+                   (unsigned long)interp, desc);
     }
 
     return interp;

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_io.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_io.c?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_io.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_io.c Thu Jun 26 05:37:25 2008
@@ -80,12 +80,12 @@
     SV *sv = TIEHANDLE_SV(handle);
 
     if (SvMAGICAL(sv) && (mg = mg_find(sv, PERL_MAGIC_tiedscalar))) {
-	char *package = HvNAME(SvSTASH((SV*)SvRV(mg->mg_obj)));
+        char *package = HvNAME(SvSTASH((SV*)SvRV(mg->mg_obj)));
 
-	if (!strEQ(package, classname)) {
-	    MP_TRACE_r(MP_FUNC, "%s tied to %s\n", GvNAME(handle), package);
-	    return TRUE;
-	}
+        if (!strEQ(package, classname)) {
+            MP_TRACE_r(MP_FUNC, "%s tied to %s\n", GvNAME(handle), package);
+            return TRUE;
+        }
     }
 
     return FALSE;

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_module.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_module.c?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_module.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_module.c Thu Jun 26 05:37:25
2008
@@ -193,9 +193,9 @@
 
     if (!base_obj || (base_obj == add_obj)) {
 #ifdef USE_ITHREADS
-	MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
-		   interp, interp->refcnt);
-	modperl_interp_unselect(interp);
+        MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
+                   interp, interp->refcnt);
+        modperl_interp_unselect(interp);
         MP_PERL_CONTEXT_RESTORE;
 #endif
         return addv;
@@ -248,7 +248,7 @@
 
 #ifdef USE_ITHREADS
     MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
-	       interp, interp->refcnt);
+               interp, interp->refcnt);
     modperl_interp_unselect(interp);
     MP_PERL_CONTEXT_RESTORE;
 #endif
@@ -419,9 +419,9 @@
 
     if (errmsg) {
 #ifdef USE_ITHREADS
-	MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
-		   interp, interp->refcnt);
-	modperl_interp_unselect(interp);
+        MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
+                   interp, interp->refcnt);
+        modperl_interp_unselect(interp);
 #endif
         return errmsg;
     }
@@ -444,9 +444,9 @@
                                                parms, &srv_obj);
         if (errmsg) {
 #ifdef USE_ITHREADS
-	    MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
-		       interp, interp->refcnt);
-	    modperl_interp_unselect(interp);
+            MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
+                       interp, interp->refcnt);
+            modperl_interp_unselect(interp);
 #endif
             return errmsg;
         }
@@ -491,7 +491,7 @@
 
 #ifdef USE_ITHREADS
     MP_TRACE_i(MP_FUNC, "unselecting: (0x%lx)->refcnt=%ld\n",
-	       interp, interp->refcnt);
+               interp, interp->refcnt);
     modperl_interp_unselect(interp);
 #endif
 
@@ -882,7 +882,7 @@
     if (!modperl_interp_pool_get(p)) {
         /* for vhosts */
         MP_TRACE_i(MP_FUNC, "set interp 0x%lx in pconf pool 0x%lx\n",
-		   (unsigned long)scfg->mip->parent, (unsigned long)p);
+                   (unsigned long)scfg->mip->parent, (unsigned long)p);
         modperl_interp_pool_set(p, scfg->mip->parent);
     }
 #endif

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_svptr_table.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_svptr_table.c?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_svptr_table.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_svptr_table.c Thu Jun 26 05:37:25
2008
@@ -55,8 +55,8 @@
     CLONE_PARAMS parms;
 
     Newz(0, tbl, 1, PTR_TBL_t);
-    tbl->tbl_max	= source->tbl_max;
-    tbl->tbl_items	= source->tbl_items;
+    tbl->tbl_max        = source->tbl_max;
+    tbl->tbl_items      = source->tbl_items;
     Newz(0, tbl->tbl_ary, tbl->tbl_max + 1, PTR_TBL_ENT_t *);
 
     dst_ary = tbl->tbl_ary;
@@ -67,13 +67,13 @@
     parms.stashes = newAV();
 
     for (i=0; i < source->tbl_max; i++, dst_ary++, src_ary++) {
-	PTR_TBL_ENT_t *src_ent, *dst_ent=NULL;
+        PTR_TBL_ENT_t *src_ent, *dst_ent=NULL;
 
-	if (!*src_ary) {
-	    continue;
+        if (!*src_ary) {
+            continue;
         }
 
-	for (src_ent = *src_ary;
+        for (src_ent = *src_ary;
              src_ent;
              src_ent = src_ent->next)
         {
@@ -110,13 +110,13 @@
     PTR_TBL_ENT_t **ary = tbl->tbl_ary;
 
     for (i=0; i < tbl->tbl_max; i++, ary++) {
-	PTR_TBL_ENT_t *ent;
+        PTR_TBL_ENT_t *ent;
 
-	if (!*ary) {
-	    continue;
+        if (!*ary) {
+            continue;
         }
 
-	for (ent = *ary; ent; ent = ent->next) {
+        for (ent = *ary; ent; ent = ent->next) {
             if (!ent->newval) {
                 continue;
             }
@@ -143,13 +143,13 @@
     entry = *oentry;
 
     for (; entry; oentry = &entry->next, entry = *oentry) {
-	if (entry->oldval == key) {
+        if (entry->oldval == key) {
             *oentry = entry->next;
             SvREFCNT_dec((SV*)entry->newval);
             Safefree(entry);
             tbl->tbl_items--;
-	    return;
-	}
+            return;
+        }
     }
 }
 
@@ -168,8 +168,8 @@
 {
     PTR_TBL_t *tbl;
     Newz(0, tbl, 1, PTR_TBL_t);
-    tbl->tbl_max	= 511;
-    tbl->tbl_items	= 0;
+    tbl->tbl_max        = 511;
+    tbl->tbl_items      = 0;
     Newz(0, tbl->tbl_ary, tbl->tbl_max + 1, PTR_TBL_ENT_t*);
     return tbl;
 }
@@ -184,8 +184,8 @@
     assert(tbl);
     tblent = tbl->tbl_ary[hash & tbl->tbl_max];
     for (; tblent; tblent = tblent->next) {
-	if (tblent->oldval == sv)
-	    return tblent->newval;
+        if (tblent->oldval == sv)
+            return tblent->newval;
     }
     return (void*)NULL;
 }
@@ -205,10 +205,10 @@
     assert(tbl);
     otblent = &tbl->tbl_ary[hash & tbl->tbl_max];
     for (tblent = *otblent; tblent; i=0, tblent = tblent->next) {
-	if (tblent->oldval == oldv) {
-	    tblent->newval = newv;
-	    return;
-	}
+        if (tblent->oldval == oldv) {
+            tblent->newval = newv;
+            return;
+        }
     }
     Newz(0, tblent, 1, PTR_TBL_ENT_t);
     tblent->oldval = oldv;
@@ -217,7 +217,7 @@
     *otblent = tblent;
     tbl->tbl_items++;
     if (i && tbl->tbl_items > tbl->tbl_max)
-	modperl_svptr_table_split(aTHX_ tbl);
+        modperl_svptr_table_split(aTHX_ tbl);
 }
 
 /* double the hash bucket size of an existing ptr table */
@@ -235,20 +235,20 @@
     tbl->tbl_max = --newsize;
     tbl->tbl_ary = ary;
     for (i=0; i < oldsize; i++, ary++) {
-	PTR_TBL_ENT_t **curentp, **entp, *ent;
-	if (!*ary)
-	    continue;
-	curentp = ary + oldsize;
-	for (entp = ary, ent = *ary; ent; ent = *entp) {
-	    if ((newsize & PTR2UV(ent->oldval)) != i) {
-		*entp = ent->next;
-		ent->next = *curentp;
-		*curentp = ent;
-		continue;
-	    }
-	    else
-		entp = &ent->next;
-	}
+        PTR_TBL_ENT_t **curentp, **entp, *ent;
+        if (!*ary)
+            continue;
+        curentp = ary + oldsize;
+        for (entp = ary, ent = *ary; ent; ent = *entp) {
+            if ((newsize & PTR2UV(ent->oldval)) != i) {
+                *entp = ent->next;
+                ent->next = *curentp;
+                *curentp = ent;
+                continue;
+            }
+            else
+                entp = &ent->next;
+        }
     }
 }
 

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_util.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_util.c?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_util.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_util.c Thu Jun 26 05:37:25 2008
@@ -265,10 +265,10 @@
     void **handles;
 
     if (!librefs) {
-	MP_TRACE_r(MP_FUNC,
+        MP_TRACE_r(MP_FUNC,
                    "Could not get @%s for unloading.\n",
                    dl_librefs);
-	return NULL;
+        return NULL;
     }
 
     if (!(AvFILL(librefs) >= 0)) {
@@ -279,23 +279,23 @@
     handles = (void **)malloc(sizeof(void *) * (AvFILL(librefs)+2));
 
     for (i=0; i<=AvFILL(librefs); i++) {
-	void *handle;
-	SV *handle_sv = *av_fetch(librefs, i, FALSE);
-	SV *module_sv = *av_fetch(modules, i, FALSE);
+        void *handle;
+        SV *handle_sv = *av_fetch(librefs, i, FALSE);
+        SV *module_sv = *av_fetch(modules, i, FALSE);
 
-	if(!handle_sv) {
-	    MP_TRACE_r(MP_FUNC,
+        if(!handle_sv) {
+            MP_TRACE_r(MP_FUNC,
                        "Could not fetch $%s[%d]!\n",
                        dl_librefs, (int)i);
-	    continue;
-	}
-	handle = INT2PTR(void *, SvIV(handle_sv));
+            continue;
+        }
+        handle = INT2PTR(void *, SvIV(handle_sv));
 
-	MP_TRACE_r(MP_FUNC, "%s dl handle == 0x%lx\n",
+        MP_TRACE_r(MP_FUNC, "%s dl handle == 0x%lx\n",
                    SvPVX(module_sv), (unsigned long)handle);
-	if (handle) {
-	    handles[i] = handle;
-	}
+        if (handle) {
+            handles[i] = handle;
+        }
     }
 
     av_clear(modules);
@@ -311,7 +311,7 @@
     int i;
 
     if (!handles) {
-	return;
+        return;
     }
 
     for (i=0; handles[i]; i++) {
@@ -415,12 +415,12 @@
 
 #ifdef HvREHASH
     if (HvREHASH(hv)) {
-	PERL_HASH_INTERNAL(hash, key, klen);
+        PERL_HASH_INTERNAL(hash, key, klen);
     }
     else
 #endif
     if (!hash) {
-	PERL_HASH(hash, key, klen);
+        PERL_HASH(hash, key, klen);
     }
 
     entry = ((HE**)HvARRAY(hv))[hash & (I32)xhv->xhv_max];
@@ -475,20 +475,20 @@
                AvFILLp(subs)+1, name);
 
     for (i=0; i<=AvFILLp(subs); i++) {
-	CV *cv = (CV*)ary[i];
-	SV *atsv = ERRSV;
+        CV *cv = (CV*)ary[i];
+        SV *atsv = ERRSV;
 
-	PUSHMARK(PL_stack_sp);
-	call_sv((SV*)cv, G_EVAL|G_DISCARD);
+        PUSHMARK(PL_stack_sp);
+        call_sv((SV*)cv, G_EVAL|G_DISCARD);
 
-	if (SvCUR(atsv)) {
+        if (SvCUR(atsv)) {
             Perl_sv_catpvf(aTHX_ atsv, "%s failed--call queue aborted",
                            name);
-	    while (PL_scopestack_ix > oldscope) {
-		LEAVE;
+            while (PL_scopestack_ix > oldscope) {
+                LEAVE;
             }
             Perl_croak(aTHX_ "%s", SvPVX(atsv));
-	}
+        }
     }
 }
 
@@ -834,13 +834,13 @@
     modperl_pnotes_t *pnotes = data;
 
 #ifdef USE_ITHREADS
-	dTHXa(pnotes->interp->perl);
+        dTHXa(pnotes->interp->perl);
 #endif
-	SvREFCNT_dec(pnotes->pnotes);
-	pnotes->pnotes = NULL;
-	pnotes->pool = NULL;
+        SvREFCNT_dec(pnotes->pnotes);
+        pnotes->pnotes = NULL;
+        pnotes->pool = NULL;
 #ifdef USE_ITHREADS
-	MP_TRACE_i(MP_FUNC, "DO: calling interp_unselect(0x%lx)\n",
+        MP_TRACE_i(MP_FUNC, "DO: calling interp_unselect(0x%lx)\n",
                pnotes->interp);
     modperl_interp_unselect(pnotes->interp);
     pnotes->interp = NULL;

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_util.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_util.h?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_util.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_util.h Thu Jun 26 05:37:25 2008
@@ -137,7 +137,7 @@
 void modperl_pnotes_kill(void *data);
 
 SV *modperl_pnotes(pTHX_ modperl_pnotes_t *pnotes, SV *key, SV *val,
-		   apr_pool_t *pool );
+                   apr_pool_t *pool );
 
 #endif /* MODPERL_UTIL_H */
 

Modified: perl/modperl/branches/threading/xs/APR/Pool/APR__Pool.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/Pool/APR__Pool.h?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Pool/APR__Pool.h (original)
+++ perl/modperl/branches/threading/xs/APR/Pool/APR__Pool.h Thu Jun 26 05:37:25 2008
@@ -75,8 +75,8 @@
          * there are no more references, in which case                  \
          * the interpreter will be putback into the mip                 \
          */                                                             \
-        MP_TRACE_i(MP_FUNC, "DO: calling interp_unselect(0x%lx)",	\
-		   acct->interp);					\
+        MP_TRACE_i(MP_FUNC, "DO: calling interp_unselect(0x%lx)",       \
+                   acct->interp);                                       \
         (void)modperl_opt_interp_unselect(acct->interp);                \
     }                                                                   \
 } STMT_END
@@ -99,8 +99,8 @@
      */                                                                 \
     if ((acct->interp = MP_THX_INTERP_GET(aTHX))) {                     \
         acct->interp->refcnt++;                                         \
-        MP_TRACE_i(MP_FUNC, "TO: (0x%lx)->refcnt incremented to %ld",	\
-		   acct->interp, acct->interp->refcnt);                 \
+        MP_TRACE_i(MP_FUNC, "TO: (0x%lx)->refcnt incremented to %ld",   \
+                   acct->interp, acct->interp->refcnt);                 \
     }                                                                   \
 } STMT_END
 
@@ -343,7 +343,7 @@
     if ((data->interp = MP_THX_INTERP_GET(data->perl))) {
         data->interp->refcnt++;
         MP_TRACE_i(MP_FUNC, "(0x%lx)->refcnt incremented to %ld",
-		   data->interp, data->interp->refcnt);
+                   data->interp, data->interp->refcnt);
     }
 #endif
 

Modified: perl/modperl/branches/threading/xs/APR/Socket/APR__Socket.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/Socket/APR__Socket.h?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Socket/APR__Socket.h (original)
+++ perl/modperl/branches/threading/xs/APR/Socket/APR__Socket.h Thu Jun 26 05:37:25 2008
@@ -59,7 +59,7 @@
 apr_interval_time_t mpxs_apr_socket_timeout_get(pTHX_ I32 items,
                                                 SV **MARK, SV **SP)
 {
-    apr_interval_time_t	t;
+    apr_interval_time_t t;
     APR__Socket APR__Socket;
 
     /* this also magically assings to APR_Socket ;-) */

Modified: perl/modperl/branches/threading/xs/Apache2/Directive/Apache2__Directive.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/Directive/Apache2__Directive.h?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/Directive/Apache2__Directive.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/Directive/Apache2__Directive.h Thu Jun 26 05:37:25
2008
@@ -122,7 +122,7 @@
     dXSARGS;
 
     if (items < 2 || items > 3) {
-	    Perl_croak(aTHX_
+            Perl_croak(aTHX_
                        "Usage: Apache2::Directive::lookup(self, key, [args])");
     }
 
@@ -137,20 +137,20 @@
         char *key = (char *)SvPV_nolen(ST(1));
         int scalar_context = (G_SCALAR == GIMME_V);
 
-	    if (SvROK(ST(0)) && sv_derived_from(ST(0), "Apache2::Directive")) {
-	        IV tmp = SvIV((SV*)SvRV(ST(0)));
-	        tree = INT2PTR(Apache2__Directive,tmp);
-	    }
-	    else {
-	        tree = ap_conftree;
+            if (SvROK(ST(0)) && sv_derived_from(ST(0), "Apache2::Directive")) {
+                IV tmp = SvIV((SV*)SvRV(ST(0)));
+                tree = INT2PTR(Apache2__Directive,tmp);
+            }
+            else {
+                tree = ap_conftree;
             }
 
-	    if (items < 3) {
-	        value = NULL;
-            }
-	    else {
-	        value = (char *)SvPV_nolen(ST(2));
-	    }
+            if (items < 3) {
+                value = NULL;
+            }
+            else {
+                value = (char *)SvPV_nolen(ST(2));
+            }
 
         while (tree) {
             directive = tree->directive;

Modified: perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h?rev=671881&r1=671880&r2=671881&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h Thu Jun 26
05:37:25 2008
@@ -52,9 +52,9 @@
 
     if (!val && !r->proxyreq &&
         r->parsed_uri.scheme &&
-	!(r->parsed_uri.hostname &&
-	  strEQ(r->parsed_uri.scheme, ap_http_scheme(r)) &&
-	  ap_matches_request_vhost(r, r->parsed_uri.hostname,
+        !(r->parsed_uri.hostname &&
+          strEQ(r->parsed_uri.scheme, ap_http_scheme(r)) &&
+          ap_matches_request_vhost(r, r->parsed_uri.hostname,
                                    r->parsed_uri.port_str ?
                                    r->parsed_uri.port :
                                    ap_default_port(r))))



Mime
View raw message