From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 24 Nov 2011 19:38:08 +0000 (+0100)
Subject: Small tidyups in S_incpush() and S_mayberelocate()
X-Git-Tag: accepted/trunk/20130322.191538~1879
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a702b9ac51e9c840d6b8bac0725b156789b8972;p=platform%2Fupstream%2Fperl.git

Small tidyups in S_incpush() and S_mayberelocate()

Following commit 816005240f1a3b99, which moved VMS-specific code, we can now
assign to subdir at the point of declaration. After the refactoring that
moved code into S_mayberelocate(), we can assign to libdir at the point of
declaration. In turn, this allows the merging of two #ifndef PERL_IS_MINIPERL
blocks. Remove a blank line from S_mayberelocate().
---

diff --git a/perl.c b/perl.c
index 748e282..013549e 100644
--- a/perl.c
+++ b/perl.c
@@ -4565,7 +4565,6 @@ S_mayberelocate(pTHX_ const char *const dir, STRLEN len, U32 flags)
 #endif
 	}
     return libdir;
-
 }
 
 STATIC void
@@ -4594,7 +4593,7 @@ S_incpush(pTHX_ const char *const dir, STRLEN len, U32 flags)
     /* Could remove this vestigial extra block, if we don't mind a lot of
        re-indenting diff noise.  */
     {
-	SV *libdir;
+	SV *const libdir = mayberelocate(dir, len, flags);
 	/* Change 20189146be79a0596543441fa369c6bf7f85103f, to fix RT#6665,
 	   arranged to unshift #! line -I onto the front of @INC. However,
 	   -I can add version and architecture specific libraries, and they
@@ -4604,23 +4603,18 @@ S_incpush(pTHX_ const char *const dir, STRLEN len, U32 flags)
 	   the front of @INC.  */
 #ifndef PERL_IS_MINIPERL
 	AV *const av = (using_sub_dirs) ? (unshift ? newAV() : inc) : NULL;
-#endif
 
-	libdir = mayberelocate(dir, len, flags);
-
-#ifndef PERL_IS_MINIPERL
 	/*
 	 * BEFORE pushing libdir onto @INC we may first push version- and
 	 * archname-specific sub-directories.
 	 */
 	if (using_sub_dirs) {
-	    SV *subdir;
+	    SV *subdir = newSVsv(libdir);
 #ifdef PERL_INC_VERSION_LIST
 	    /* Configure terminates PERL_INC_VERSION_LIST with a NULL */
 	    const char * const incverlist[] = { PERL_INC_VERSION_LIST };
 	    const char * const *incver;
 #endif
-	    subdir = newSVsv(libdir);
 
 	    if (add_versioned_sub_dirs) {
 		/* .../version/archname if -d .../version/archname */