Change 34927 by [EMAIL PROTECTED] on 2008/11/26 20:29:58
Exactly 1 function, in perl.c, calls Perl_magicname(), so inline it.
Affected files ...
... //depot/perl/embed.fnc#641 edit
... //depot/perl/embed.h#778 edit
... //depot/perl/perl.c#889 edit
... //depot/perl/proto.h#975 edit
Differences ...
==== //depot/perl/embed.fnc#641 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#640~34926~ 2008-11-26 12:14:02.000000000 -0800
+++ perl/embed.fnc 2008-11-26 12:29:58.000000000 -0800
@@ -513,7 +513,6 @@
p |int |magic_set_all_env|NN SV* sv|NN MAGIC* mg
p |U32 |magic_sizepack |NN SV* sv|NN MAGIC* mg
p |int |magic_wipepack |NN SV* sv|NN MAGIC* mg
-p |void |magicname |NN const char* sym|NULLOK const char* name|I32
namlen
Ap |void |markstack_grow
#if defined(USE_LOCALE_COLLATE)
p |int |magic_setcollxfrm|NN SV* sv|NN MAGIC* mg
==== //depot/perl/embed.h#778 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#777~34926~ 2008-11-26 12:14:02.000000000 -0800
+++ perl/embed.h 2008-11-26 12:29:58.000000000 -0800
@@ -475,7 +475,6 @@
#define magic_set_all_env Perl_magic_set_all_env
#define magic_sizepack Perl_magic_sizepack
#define magic_wipepack Perl_magic_wipepack
-#define magicname Perl_magicname
#endif
#define markstack_grow Perl_markstack_grow
#if defined(USE_LOCALE_COLLATE)
@@ -2812,7 +2811,6 @@
#define magic_set_all_env(a,b) Perl_magic_set_all_env(aTHX_ a,b)
#define magic_sizepack(a,b) Perl_magic_sizepack(aTHX_ a,b)
#define magic_wipepack(a,b) Perl_magic_wipepack(aTHX_ a,b)
-#define magicname(a,b,c) Perl_magicname(aTHX_ a,b,c)
#endif
#define markstack_grow() Perl_markstack_grow(aTHX)
#if defined(USE_LOCALE_COLLATE)
==== //depot/perl/perl.c#889 (text) ====
Index: perl/perl.c
--- perl/perl.c#888~34902~ 2008-11-24 01:37:04.000000000 -0800
+++ perl/perl.c 2008-11-26 12:29:58.000000000 -0800
@@ -2892,17 +2892,6 @@
POPSTACK;
}
-void
-Perl_magicname(pTHX_ const char *sym, const char *name, I32 namlen)
-{
- register GV * const gv = gv_fetchpv(sym, GV_ADD, SVt_PV);
-
- PERL_ARGS_ASSERT_MAGICNAME;
-
- if (gv)
- sv_magic(GvSV(gv), MUTABLE_SV(gv), PERL_MAGIC_sv, name, namlen);
-}
-
STATIC void
S_usage(pTHX_ const char *name) /* XXX move this out into a
module ? */
{
@@ -4654,7 +4643,11 @@
sv_setpv(GvSV(tmpgv),MacPerl_MPWFileName(PL_origfilename));
#else
sv_setpv(GvSV(tmpgv),PL_origfilename);
- magicname("0", "0", 1);
+ {
+ GV * const gv = gv_fetchpv("0", GV_ADD, SVt_PV);
+ if (gv)
+ sv_magic(GvSV(gv), MUTABLE_SV(gv), PERL_MAGIC_sv, "0", 1);
+ }
#endif
}
if ((PL_envgv = gv_fetchpvs("ENV", GV_ADD|GV_NOTQUAL, SVt_PVHV))) {
==== //depot/perl/proto.h#975 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#974~34926~ 2008-11-26 12:14:02.000000000 -0800
+++ perl/proto.h 2008-11-26 12:29:58.000000000 -0800
@@ -1796,11 +1796,6 @@
#define PERL_ARGS_ASSERT_MAGIC_WIPEPACK \
assert(sv); assert(mg)
-PERL_CALLCONV void Perl_magicname(pTHX_ const char* sym, const char* name,
I32 namlen)
- __attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_MAGICNAME \
- assert(sym)
-
PERL_CALLCONV void Perl_markstack_grow(pTHX);
#if defined(USE_LOCALE_COLLATE)
PERL_CALLCONV int Perl_magic_setcollxfrm(pTHX_ SV* sv, MAGIC* mg)
End of Patch.
