summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2002-08-11 17:59:16 +0100
committerhv <hv@crypt.org>2002-08-12 11:24:44 +0000
commit84e79d796bb50b7bff488c047a08258aee06f602 (patch)
tree191200918fa9ba07a21327d684ec7baa08d2b626
parent03ae59b2624f6cd2d8682b1ce153473816c7338c (diff)
downloadperl-84e79d796bb50b7bff488c047a08258aee06f602.tar.gz
gv_fullname3 as call to gv_fullname4
Message-id: <20020811155914.GE300@Bagpuss.unfortu.net> p4raw-id: //depot/perl@17713
-rw-r--r--gv.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/gv.c b/gv.c
index 3ab1935ec6..88e343ab7e 100644
--- a/gv.c
+++ b/gv.c
@@ -1077,15 +1077,7 @@ Perl_gv_fullname4(pTHX_ SV *sv, GV *gv, const char *prefix, bool keepmain)
void
Perl_gv_fullname3(pTHX_ SV *sv, GV *gv, const char *prefix)
{
- HV *hv = GvSTASH(gv);
- if (!hv) {
- (void)SvOK_off(sv);
- return;
- }
- sv_setpv(sv, prefix ? prefix : "");
- sv_catpv(sv,HvNAME(hv));
- sv_catpvn(sv,"::", 2);
- sv_catpvn(sv,GvNAME(gv),GvNAMELEN(gv));
+ gv_fullname4(sv, gv, prefix, TRUE);
}
void
@@ -1100,10 +1092,7 @@ Perl_gv_efullname4(pTHX_ SV *sv, GV *gv, const char *prefix, bool keepmain)
void
Perl_gv_efullname3(pTHX_ SV *sv, GV *gv, const char *prefix)
{
- GV *egv = GvEGV(gv);
- if (!egv)
- egv = gv;
- gv_fullname3(sv, egv, prefix);
+ gv_efullname4(sv, gv, prefix, TRUE);
}
/* XXX compatibility with versions <= 5.003. */