From: Nicholas Clark <nick@ccl4.org>
Date: Mon, 6 Feb 2006 20:52:41 +0000 (+0000)
Subject: Rename S_glob_assign to S_glob_assign_glob
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2eb429524bee19249b294c044e4a261d66f56867;p=p5sagit%2Fp5-mst-13.2.git

Rename S_glob_assign to S_glob_assign_glob
Rename S_pvgv_assign to S_glob_assign_ref

I don't think that they share enough common code to merge them.

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

diff --git a/sv.c b/sv.c
index d96bb3b..9c379b8 100644
--- a/sv.c
+++ b/sv.c
@@ -3030,7 +3030,7 @@ copy-ish functions and macros use this underneath.
 */
 
 static void
-S_glob_assign(pTHX_ SV *dstr, SV *sstr, const int dtype)
+S_glob_assign_glob(pTHX_ SV *dstr, SV *sstr, const int dtype)
 {
     if (dtype != SVt_PVGV) {
 	const char * const name = GvNAME(sstr);
@@ -3069,7 +3069,7 @@ S_glob_assign(pTHX_ SV *dstr, SV *sstr, const int dtype)
 }
 
 static void
-S_pvgv_assign(pTHX_ SV *dstr, SV *sstr) {
+S_glob_assign_ref(pTHX_ SV *dstr, SV *sstr) {
     SV * const sref = SvREFCNT_inc(SvRV(sstr));
     SV *dref = NULL;
     const int intro = GvINTRO(dstr);
@@ -3302,7 +3302,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags)
 
     case SVt_PVGV:
 	if (dtype <= SVt_PVGV) {
-	    S_glob_assign(aTHX_ dstr, sstr, dtype);
+	    S_glob_assign_glob(aTHX_ dstr, sstr, dtype);
 	    return;
 	}
 	/* FALL THROUGH */
@@ -3313,7 +3313,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags)
 	    if ((int)SvTYPE(sstr) != stype) {
 		stype = SvTYPE(sstr);
 		if (stype == SVt_PVGV && dtype <= SVt_PVGV) {
-		    S_glob_assign(aTHX_ dstr, sstr, dtype);
+		    S_glob_assign_glob(aTHX_ dstr, sstr, dtype);
 		    return;
 		}
 	    }
@@ -3339,13 +3339,13 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags)
 		GvMULTI_on(dstr);
 		return;
 	    }
-	    S_glob_assign(aTHX_ dstr, sstr, dtype);
+	    S_glob_assign_glob(aTHX_ dstr, sstr, dtype);
 	    return;
 	}
 
 	if (dtype >= SVt_PV) {
 	    if (dtype == SVt_PVGV) {
-		S_pvgv_assign(aTHX_ dstr, sstr);
+		S_glob_assign_ref(aTHX_ dstr, sstr);
 		return;
 	    }
 	    if (SvPVX_const(dstr)) {