From d2719217c9b7910115cef7ea0c16d68e6b286cf7 Mon Sep 17 00:00:00 2001 From: Gurusamy Sarathy Date: Mon, 18 May 1998 07:51:19 +0000 Subject: [PATCH] [win32] more whitespace tweaks from maintbranch p4raw-id: //depot/win32/perl@1009 --- av.c | 3 +-- perl.c | 5 +---- pp_ctl.c | 6 ++++-- pp_sys.c | 8 ++++---- toke.c | 4 ++-- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/av.c b/av.c index b4621f3..02be7cc 100644 --- a/av.c +++ b/av.c @@ -369,7 +369,6 @@ av_undef(register AV *av) SvREFCNT_dec(AvARRAY(av)[--key]); } Safefree(AvALLOC(av)); - SvPVX(av) = 0; AvALLOC(av) = 0; SvPVX(av) = 0; AvMAX(av) = AvFILLp(av) = -1; @@ -479,7 +478,7 @@ av_unshift(register AV *av, register I32 num) AvFILLp(av) += i; SvPVX(av) = (char*)(AvARRAY(av) - i); } - if (num) { + if (num) { i = AvFILLp(av); av_extend(av, i + num); AvFILLp(av) += num; diff --git a/perl.c b/perl.c index e2856f8..e02786e 100644 --- a/perl.c +++ b/perl.c @@ -2676,7 +2676,7 @@ call_list(I32 oldscope, AV *list) dJMPENV; int ret; - while (AvFILL(list) >= 0) { + while (AvFILL(list) >= 0) { CV *cv = (CV*)av_shift(list); SAVEFREESV(cv); @@ -2814,6 +2814,3 @@ my_exit_jump(void) JMPENV_JUMP(2); } - - - diff --git a/pp_ctl.c b/pp_ctl.c index ede74b5..61e940f 100644 --- a/pp_ctl.c +++ b/pp_ctl.c @@ -915,14 +915,16 @@ block_gimme(void) return G_VOID; switch (cxstack[cxix].blk_gimme) { + case G_VOID: + return G_VOID; case G_SCALAR: return G_SCALAR; case G_ARRAY: return G_ARRAY; default: croak("panic: bad gimme: %d\n", cxstack[cxix].blk_gimme); - case G_VOID: - return G_VOID; + /* NOTREACHED */ + return 0; } } diff --git a/pp_sys.c b/pp_sys.c index d00d162..fee474f 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -581,7 +581,8 @@ PP(pp_untie) { djSP; SV * sv ; - sv = POPs; + + sv = POPs; if (dowarn) { MAGIC * mg ; @@ -4152,7 +4153,7 @@ PP(pp_gpwent) sv_setpv(sv, pwent->pw_gecos); #endif #ifndef INCOMPLETE_TAINTS - /* pw_gecos is tainted. */ + /* pw_gecos is tainted because user himself can diddle with it. */ SvTAINTED_on(sv); #endif @@ -4303,7 +4304,7 @@ PP(pp_getlogin) PP(pp_syscall) { -#ifdef HAS_SYSCALL +#ifdef HAS_SYSCALL djSP; dMARK; dORIGMARK; dTARGET; register I32 items = SP - MARK; unsigned long a[20]; @@ -4517,4 +4518,3 @@ int operation; } #endif /* LOCKF_EMULATE_FLOCK */ - diff --git a/toke.c b/toke.c index 4a21941..02f8cb9 100644 --- a/toke.c +++ b/toke.c @@ -189,7 +189,7 @@ missingterm(char *s) char q; if (s) { char *nl = strrchr(s,'\n'); - if (nl) + if (nl) *nl = '\0'; } else if (multi_close < 32 || multi_close == 127) { @@ -5086,7 +5086,7 @@ scan_heredoc(register char *s) } sv_setpvn(tmpstr,d+1,s-d); s += len - 1; - curcop->cop_line++; /* the preceding stmt passes a newline */ + curcop->cop_line++; /* the preceding stmt passes a newline */ sv_catpvn(herewas,s,bufend-s); sv_setsv(linestr,herewas); -- 2.7.4