[win32] sundry whitespace cleanups from maintbranch

p4raw-id: //depot/win32/perl@1008

diff --git a/Porting/Contract b/Porting/Contract
index 75a24a7..cc91af2 100644 (file)
--- a/Porting/Contract
+++ b/Porting/Contract
@@ -1,3 +1,4 @@
+
                      Contributed Modules in Perl Core
                  A Social Contract about Artistic Control
 
@@ -101,3 +102,7 @@ should be open communication, respect for opposing views, and an attempt
 at a compromise.  In nearly every circumstance nothing more will be
 necessary, and certainly no more drastic measure should be used until
 every avenue of communication and discussion has failed.
+
+-- 
+Version 1.2.  By Russ Allbery (rra@stanford.edu) and the perl5-porters.
+

diff --git a/XSUB.h b/XSUB.h
index 6f9151b..6c6c76e 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -7,7 +7,7 @@
 #endif
 
 #define dXSARGS                                \
-       dSP; dMARK;             \
+       dSP; dMARK;                     \
        I32 ax = mark - stack_base + 1; \
        I32 items = sp - mark
 

diff --git a/av.c b/av.c
index daba15b..b4621f3 100644 (file)
--- a/av.c
+++ b/av.c
@@ -21,10 +21,10 @@ av_reify(AV *av)
     I32 key;
     SV* sv;
 
-    if (AvREAL(av))                           
-       return;          
+    if (AvREAL(av))
+       return;
 #ifdef DEBUGGING
-    if (SvRMAGICAL(av) && mg_find((SV*)av,'P')) 
+    if (SvRMAGICAL(av) && mg_find((SV*)av,'P'))
        warn("av_reify called on tied array");
 #endif
     key = AvMAX(av) + 1;

diff --git a/gv.c b/gv.c
index b48e4d8..1ef3b01 100644 (file)
--- a/gv.c
+++ b/gv.c
@@ -443,11 +443,11 @@ gv_fetchpv(char *nambeg, I32 add, I32 sv_type)
 
            len = namend - name;
            if (len > 0) {
+               char smallbuf[256];
                char *tmpbuf;
-               char autobuf[64];
 
-               if (len < sizeof(autobuf) - 2)
-                   tmpbuf = autobuf;
+               if (len + 3 < sizeof smallbuf)
+                   tmpbuf = smallbuf;
                else
                    New(601, tmpbuf, len+3, char);
                Copy(name, tmpbuf, len, char);
@@ -462,7 +462,7 @@ gv_fetchpv(char *nambeg, I32 add, I32 sv_type)
                    else
                        GvMULTI_on(gv);
                }
-               if (tmpbuf != autobuf)
+               if (tmpbuf != smallbuf)
                    Safefree(tmpbuf);
                if (!gv || gv == (GV*)&sv_undef)
                    return Nullgv;

diff --git a/mg.c b/mg.c
index 268ec80..f30629b 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -1377,7 +1377,7 @@ magic_getdefelem(SV *sv, MAGIC *mg)
                targ = HeVAL(he);
        }
        else {
-           AV* av = (AV*)LvTARG(sv); 
+           AV* av = (AV*)LvTARG(sv);
            if ((I32)LvTARGOFF(sv) <= AvFILL(av))
                targ = AvARRAY(av)[LvTARGOFF(sv)];
        }

diff --git a/perl.c b/perl.c
index 3cdbcfa..e2856f8 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -696,7 +696,7 @@ setuid perl scripts securely.\n");
            if (euid != uid || egid != gid)
                croak("No -e allowed in setuid scripts");
            if (!e_script) {
-               e_script = newSVpv("",0);
+               e_script = newSVpv("",0);
                filter_add(read_e_script, NULL);
            }
            if (*++s)