From 5f74f29c8f6f417d66c92da59fd3fa4b09850be6 Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Sun, 2 Dec 2001 17:07:57 +0000 Subject: [PATCH] Various small nits found by DJGPP build. p4raw-id: //depot/perl@13427 --- doio.c | 8 ++++---- mg.c | 2 +- pp.c | 11 ++++++----- util.c | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/doio.c b/doio.c index 27582d9..abf9ae5 100644 --- a/doio.c +++ b/doio.c @@ -691,11 +691,11 @@ Perl_nextargv(pTHX_ register GV *gv) sv_catpv(sv,PL_inplace); } #ifndef FLEXFILENAMES - if (PerlLIO_stat(SvPVX(sv),&PL_statbuf) >= 0 - && PL_statbuf.st_dev == filedev - && PL_statbuf.st_ino == fileino + if ((PerlLIO_stat(SvPVX(sv),&PL_statbuf) >= 0 + && PL_statbuf.st_dev == filedev + && PL_statbuf.st_ino == fileino) #ifdef DJGPP - || (_djstat_fail_bits & _STFAIL_TRUENAME)!=0 + || ((_djstat_fail_bits & _STFAIL_TRUENAME)!=0) #endif ) { diff --git a/mg.c b/mg.c index 2a80760..6897c99 100644 --- a/mg.c +++ b/mg.c @@ -869,7 +869,6 @@ Perl_magic_setenv(pTHX_ SV *sv, MAGIC *mg) register char *s; char *ptr; STRLEN len, klen; - I32 i; s = SvPV(sv,len); ptr = MgPV(mg,klen); @@ -922,6 +921,7 @@ Perl_magic_setenv(pTHX_ SV *sv, MAGIC *mg) while (s < strend) { char tmpbuf[256]; struct stat st; + I32 i; s = delimcpy(tmpbuf, tmpbuf + sizeof tmpbuf, s, strend, ':', &i); s++; diff --git a/pp.c b/pp.c index fd4c52c..3ab629e 100644 --- a/pp.c +++ b/pp.c @@ -3142,9 +3142,10 @@ PP(pp_chr) PP(pp_crypt) { - dSP; dTARGET; dPOPTOPssrl; - STRLEN n_a; + dSP; dTARGET; #ifdef HAS_CRYPT + dPOPTOPssrl; + STRLEN n_a; STRLEN len; char *tmps = SvPV(left, len); char *t = 0; @@ -3161,11 +3162,11 @@ PP(pp_crypt) } tmps = t; } -#ifdef FCRYPT +# ifdef FCRYPT sv_setpv(TARG, fcrypt(tmps, SvPV(right, n_a))); -#else +# else sv_setpv(TARG, PerlProc_crypt(tmps, SvPV(right, n_a))); -#endif +# endif Safefree(t); #else DIE(aTHX_ diff --git a/util.c b/util.c index de84200..cf1dee0 100644 --- a/util.c +++ b/util.c @@ -2591,7 +2591,7 @@ Perl_find_script(pTHX_ char *scriptname, bool dosearch, char **search_ext, I32 f char *xfailed = Nullch; char tmpbuf[MAXPATHLEN]; register char *s; - I32 len; + I32 len = 0; int retval; #if defined(DOSISH) && !defined(OS2) && !defined(atarist) # define SEARCH_EXTS ".bat", ".cmd", NULL -- 2.7.4