This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
The overly-picky AIX xlc compiler doesn't like the style
authorH.Merijn Brand <h.m.brand@xs4all.nl>
Tue, 12 Dec 2006 11:36:41 +0000 (11:36 +0000)
committerH.Merijn Brand <h.m.brand@xs4all.nl>
Tue, 12 Dec 2006 11:36:41 +0000 (11:36 +0000)
from patch #29446

p4raw-id: //depot/perl@29530

mg.c

diff --git a/mg.c b/mg.c
index 56e8065..611bb4e 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -2631,18 +2631,18 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
                /* Shorter than original, will be padded. */
                Copy(s, PL_origargv[0], len, char);
                PL_origargv[0][len] = 0;
-               memset(PL_origargv[0] + len + 1,
 #ifdef PERL_DARWIN
-                      /* Special case for darwin: see [perl #38868] */
-                      (int)'\0',
+               /* Special case for darwin: see [perl #38868] */
+               memset(PL_origargv[0] + len + 1,
+                      (int)'\0', PL_origalen - len - 1);
 #else
-                      /* Is the space counterintuitive?  Yes.
-                       * (You were expecting \0?)
-                       * Does it work?  Seems to.  (In Linux 2.4.20 at least.)
-                       * --jhi */
-                      (int)' ',
+               /* Is the space counterintuitive?  Yes.
+                * (You were expecting \0?)
+                * Does it work?  Seems to.  (In Linux 2.4.20 at least.)
+                * --jhi */
+               memset(PL_origargv[0] + len + 1,
+                      (int)' ',  PL_origalen - len - 1);
 #endif
-                      PL_origalen - len - 1);
            }
            PL_origargv[0][PL_origalen-1] = 0;
            for (i = 1; i < PL_origargc; i++)