Author: gozer
Date: Sun Dec 30 23:31:16 2007
New Revision: 607692
URL: http://svn.apache.org/viewvc?rev=607692&view=rev
Log:
*Whitespace*
expands tabs in C files
Reviewed-by: gozer
Submitted-by: Torsten Foertsch <[EMAIL PROTECTED]>
Message-Id: <[EMAIL PROTECTED]>
Modified:
perl/modperl/trunk/src/modules/perl/modperl_config.h
perl/modperl/trunk/src/modules/perl/modperl_io.c
perl/modperl/trunk/src/modules/perl/modperl_svptr_table.c
perl/modperl/trunk/src/modules/perl/modperl_util.c
perl/modperl/trunk/xs/APR/Socket/APR__Socket.h
perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h
perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h
Modified: perl/modperl/trunk/src/modules/perl/modperl_config.h
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_config.h?rev=607692&r1=607691&r2=607692&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_config.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_config.h Sun Dec 30 23:31:16
2007
@@ -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/trunk/src/modules/perl/modperl_io.c
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_io.c?rev=607692&r1=607691&r2=607692&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_io.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_io.c Sun Dec 30 23:31:16 2007
@@ -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/trunk/src/modules/perl/modperl_svptr_table.c
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_svptr_table.c?rev=607692&r1=607691&r2=607692&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_svptr_table.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_svptr_table.c Sun Dec 30
23:31:16 2007
@@ -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/trunk/src/modules/perl/modperl_util.c
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_util.c?rev=607692&r1=607691&r2=607692&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_util.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_util.c Sun Dec 30 23:31:16 2007
@@ -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];
@@ -476,20 +476,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));
- }
+ }
}
}
@@ -873,15 +873,15 @@
SV *retval = Nullsv;
if (!*pnotes) {
- apr_pool_t *pool = r ? r->pool : c->pool;
- void *cleanup_data;
- *pnotes = newHV();
+ apr_pool_t *pool = r ? r->pool : c->pool;
+ void *cleanup_data;
+ *pnotes = newHV();
cleanup_data = modperl_pnotes_cleanup_data(aTHX_ pnotes, pool);
- apr_pool_cleanup_register(pool, cleanup_data,
- modperl_cleanup_pnotes,
- apr_pool_cleanup_null);
+ apr_pool_cleanup_register(pool, cleanup_data,
+ modperl_cleanup_pnotes,
+ apr_pool_cleanup_null);
}
if (key) {
Modified: perl/modperl/trunk/xs/APR/Socket/APR__Socket.h
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Socket/APR__Socket.h?rev=607692&r1=607691&r2=607692&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Socket/APR__Socket.h (original)
+++ perl/modperl/trunk/xs/APR/Socket/APR__Socket.h Sun Dec 30 23:31:16 2007
@@ -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/trunk/xs/Apache2/Directive/Apache2__Directive.h
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h?rev=607692&r1=607691&r2=607692&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h (original)
+++ perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h Sun Dec 30
23:31:16 2007
@@ -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;
+ if (items < 3) {
+ value = NULL;
+ }
+ else {
+ value = (char *)SvPV_nolen(ST(2));
}
- else {
- value = (char *)SvPV_nolen(ST(2));
- }
while (tree) {
directive = tree->directive;
Modified: perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h?rev=607692&r1=607691&r2=607692&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h (original)
+++ perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h Sun Dec 30
23:31:16 2007
@@ -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))))
