[perl.git] branch blead, updated. GitLive-blead-674-g929e5b3

In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/929e5b34a48f2f21c82b4ada33e5aca96564df80?hp=35ba5ce91a22479d4dd45634b4ece57058aef92f>

- Log -----------------------------------------------------------------
commit 929e5b34a48f2f21c82b4ada33e5aca96564df80
Author: Nicholas Clark <nick@ccl4.org>
Date:   Sun Feb 22 17:37:26 2009 +0000

    In S_init_perllib(), initialise perl5lib to NULL, to keep trace flow happy.

M	perl.c

commit 7fc731078209e8c26ed8bba477edfd90724c7146
Author: Nicholas Clark <nick@ccl4.org>
Date:   Sun Feb 22 17:24:04 2009 +0000

    In S_incpush(), replace (addsubdirs || addoldvers) with a constant variable.

M	perl.c
-----------------------------------------------------------------------

Summary of changes:
 perl.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/perl.c b/perl.c
index ca9ab00..0b03e41 100644
--- a/perl.c
+++ b/perl.c
@@ -4093,7 +4093,7 @@ S_init_perllib(pTHX)
 {
     dVAR;
 #ifndef VMS
-    const char *perl5lib;
+    const char *perl5lib = NULL;
 #endif
     const char *s;
 #ifdef WIN32
@@ -4338,6 +4338,8 @@ STATIC void
 S_incpush(pTHX_ const char *const dir, STRLEN len, U32 flags)
 {
     dVAR;
+    const U8 using_sub_dirs
+	= (U8)flags & (INCPUSH_ADD_SUB_DIRS|INCPUSH_ADD_OLD_VERS);
     const U8 addsubdirs  = (U8)flags & INCPUSH_ADD_SUB_DIRS;
     const U8 addoldvers  = (U8)flags & INCPUSH_ADD_OLD_VERS;
     const U8 canrelocate = (U8)flags & INCPUSH_CAN_RELOCATE;
@@ -4351,7 +4353,7 @@ S_incpush(pTHX_ const char *const dir, STRLEN len, U32 flags)
 
     inc = GvAVn(PL_incgv);
 
-    if (addsubdirs || addoldvers) {
+    if (using_sub_dirs) {
 	subdir = newSV(0);
     }
 
@@ -4364,8 +4366,7 @@ S_incpush(pTHX_ const char *const dir, STRLEN len, U32 flags)
 	   pushing. Hence to make it work, need to push the architecture
 	   (etc) libraries onto a temporary array, then "unshift" that onto
 	   the front of @INC.  */
-	AV *const av
-	    = (addsubdirs || addoldvers) ? (unshift ? newAV() : inc) : NULL;
+	AV *const av = (using_sub_dirs) ? (unshift ? newAV() : inc) : NULL;
 
 	if (len) {
 	    /* I am not convinced that this is valid when PERLLIB_MANGLE is

--
Perl5 Master Repository

• [perl.git] branch blead, updated. GitLive-blead-674-g929e5b3 by Nicholas Clark