dougm 01/05/02 23:45:25 Modified: xs/Apache/Log Apache__Log.h Log: untabify Revision Changes Path 1.2 +23 -23 modperl-2.0/xs/Apache/Log/Apache__Log.h Index: Apache__Log.h =================================================================== RCS file: /home/cvs/modperl-2.0/xs/Apache/Log/Apache__Log.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Apache__Log.h 2001/05/03 06:20:58 1.1 +++ Apache__Log.h 2001/05/03 06:45:25 1.2 @@ -1,9 +1,9 @@ static void mpxs_Apache__Log_BOOT(pTHXo) { av_push(get_av("Apache::Log::Request::ISA",TRUE), - newSVpv("Apache::Log",11)); + newSVpv("Apache::Log",11)); av_push(get_av("Apache::Log::Server::ISA",TRUE), - newSVpv("Apache::Log",11)); + newSVpv("Apache::Log",11)); } #define croak_inval_obj() \ @@ -22,11 +22,11 @@ request_rec *r = NULL; if (SvROK(sv) && sv_isa(sv, "Apache::Log::Request")) { - r = (request_rec *)SvObjIV(sv); - s = r->server; + r = (request_rec *)SvObjIV(sv); + s = r->server; } else if (SvROK(sv) && sv_isa(sv, "Apache::Log::Server")) { - s = (server_rec *)SvObjIV(sv); + s = (server_rec *)SvObjIV(sv); } else { croak_inval_obj(); @@ -34,33 +34,33 @@ if ((lmask == APLOG_DEBUG) && (s->loglevel >= APLOG_DEBUG)) { COP *cop = cxstack[1].blk_oldcop; - file = CopFILE(cop); /* (caller)[1] */ - line = CopLINE(cop); /* (caller)[2] */ + file = CopFILE(cop); /* (caller)[1] */ + line = CopLINE(cop); /* (caller)[2] */ } if ((s->loglevel >= lmask) && SvROK(msg) && (SvTYPE(SvRV(msg)) == SVt_PVCV)) { - dSP; - ENTER;SAVETMPS; - PUSHMARK(sp); - (void)call_sv(msg, G_SCALAR); - SPAGAIN; - svstr = POPs; - (void)SvREFCNT_inc(svstr); - PUTBACK; - FREETMPS;LEAVE; - str = SvPV(svstr,n_a); + dSP; + ENTER;SAVETMPS; + PUSHMARK(sp); + (void)call_sv(msg, G_SCALAR); + SPAGAIN; + svstr = POPs; + (void)SvREFCNT_inc(svstr); + PUTBACK; + FREETMPS;LEAVE; + str = SvPV(svstr,n_a); } else { - str = SvPV(msg,n_a); + str = SvPV(msg,n_a); } if (r) { - ap_log_rerror(file, line, APLOG_NOERRNO|level, 0, r, "%s", str); + ap_log_rerror(file, line, APLOG_NOERRNO|level, 0, r, "%s", str); } else { - ap_log_error(file, line, APLOG_NOERRNO|level, 0, s, "%s", str); + ap_log_error(file, line, APLOG_NOERRNO|level, 0, s, "%s", str); } if (svstr) { @@ -84,11 +84,11 @@ switch (logtype) { case MP_LOG_REQUEST: pclass = "Apache::Log::Request"; - retval = (void *)modperl_sv2request_rec(aTHX_ sv); + retval = (void *)modperl_sv2request_rec(aTHX_ sv); break; case MP_LOG_SERVER: - pclass = "Apache::Log::Server"; - retval = (void *)SvObjIV(sv); + pclass = "Apache::Log::Server"; + retval = (void *)SvObjIV(sv); break; default: croak_inval_obj();