Author: stas Date: Sun Dec 26 15:45:59 2004 New Revision: 123372 URL: http://svn.apache.org/viewcvs?view=rev&rev=123372 Log: consistently use PERL_MAGIC_* macros everywhere (makes it easier to grep for certain kinds of magic)
Modified: perl/modperl/trunk/src/modules/perl/modperl_filter.c perl/modperl/trunk/src/modules/perl/modperl_io.c perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h Modified: perl/modperl/trunk/src/modules/perl/modperl_filter.c Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_filter.c?view=diff&rev=123372&p1=perl/modperl/trunk/src/modules/perl/modperl_filter.c&r1=123371&p2=perl/modperl/trunk/src/modules/perl/modperl_filter.c&r2=123372 ============================================================================== --- perl/modperl/trunk/src/modules/perl/modperl_filter.c (original) +++ perl/modperl/trunk/src/modules/perl/modperl_filter.c Sun Dec 26 15:45:59 2004 @@ -354,13 +354,13 @@ static void modperl_filter_mg_set(pTHX_ SV *obj, modperl_filter_t *filter) { - sv_magic(SvRV(obj), Nullsv, '~', NULL, -1); + sv_magic(SvRV(obj), Nullsv, PERL_MAGIC_ext, NULL, -1); SvMAGIC(SvRV(obj))->mg_ptr = (char *)filter; } modperl_filter_t *modperl_filter_mg_get(pTHX_ SV *obj) { - MAGIC *mg = mg_find(SvRV(obj), '~'); + MAGIC *mg = mg_find(SvRV(obj), PERL_MAGIC_ext); return mg ? (modperl_filter_t *)mg->mg_ptr : NULL; } @@ -375,7 +375,7 @@ if (gv) { CV *cv = modperl_mgv_cv(gv); if (cv && SvMAGICAL(cv)) { - MAGIC *mg = mg_find((SV*)(cv), '~'); + MAGIC *mg = mg_find((SV*)(cv), PERL_MAGIC_ext); init_handler_pv_code = mg ? mg->mg_ptr : NULL; } else { Modified: perl/modperl/trunk/src/modules/perl/modperl_io.c Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_io.c?view=diff&rev=123372&p1=perl/modperl/trunk/src/modules/perl/modperl_io.c&r1=123371&p2=perl/modperl/trunk/src/modules/perl/modperl_io.c&r2=123372 ============================================================================== --- perl/modperl/trunk/src/modules/perl/modperl_io.c (original) +++ perl/modperl/trunk/src/modules/perl/modperl_io.c Sun Dec 26 15:45:59 2004 @@ -28,7 +28,7 @@ modperl_io_handle_untie(aTHX_ handle); - sv_magic(TIEHANDLE_SV(handle), obj, 'q', Nullch, 0); + sv_magic(TIEHANDLE_SV(handle), obj, PERL_MAGIC_tiedscalar, Nullch, 0); SvREFCNT_dec(obj); /* since sv_magic did SvREFCNT_inc */ @@ -78,7 +78,7 @@ MAGIC *mg; SV *sv = TIEHANDLE_SV(handle); - if (SvMAGICAL(sv) && (mg = mg_find(sv, 'q'))) { + if (SvMAGICAL(sv) && (mg = mg_find(sv, PERL_MAGIC_tiedscalar))) { char *package = HvNAME(SvSTASH((SV*)SvRV(mg->mg_obj))); if (!strEQ(package, classname)) { @@ -93,14 +93,14 @@ MP_INLINE void modperl_io_handle_untie(pTHX_ GV *handle) { #ifdef MP_TRACE - if (mg_find(TIEHANDLE_SV(handle), 'q')) { + if (mg_find(TIEHANDLE_SV(handle), PERL_MAGIC_tiedscalar)) { MP_TRACE_r(MP_FUNC, "untie *%s(0x%lx), REFCNT=%d\n", GvNAME(handle), (unsigned long)handle, SvREFCNT(TIEHANDLE_SV(handle))); } #endif - sv_unmagic(TIEHANDLE_SV(handle), 'q'); + sv_unmagic(TIEHANDLE_SV(handle), PERL_MAGIC_tiedscalar); } MP_INLINE GV *modperl_io_perlio_override_stdin(pTHX_ request_rec *r) Modified: perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h?view=diff&rev=123372&p1=perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h&r1=123371&p2=perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h&r2=123372 ============================================================================== --- perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h (original) +++ perl/modperl/trunk/src/modules/perl/modperl_perl_includes.h Sun Dec 26 15:45:59 2004 @@ -103,6 +103,10 @@ # define PERL_MAGIC_tied 'P' #endif +#ifndef PERL_MAGIC_tiedscalar +# define PERL_MAGIC_tiedscalar 'p' +#endif + #ifndef PERL_MAGIC_ext # define PERL_MAGIC_ext '~' #endif
