From: Nicholas Clark <nick@ccl4.org>
Date: Sun, 11 Aug 2002 16:59:16 +0000 (+0100)
Subject: gv_fullname3 as call to gv_fullname4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=84e79d796bb50b7bff488c047a08258aee06f602;p=p5sagit%2Fp5-mst-13.2.git

gv_fullname3 as call to gv_fullname4
Message-id: <20020811155914.GE300@Bagpuss.unfortu.net>

p4raw-id: //depot/perl@17713
---

diff --git a/gv.c b/gv.c
index 3ab1935..88e343a 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. */