summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2014-03-01 22:53:52 +0100
committerNicholas Clark <nick@ccl4.org>2014-03-19 10:57:52 +0100
commitb4464d55c8c3facb333bef167fb547bff86d55ae (patch)
tree1c105539529ca82dc947e9cd3b92020a932866d1
parent26297fe91bb067fd2c1370f1d9b8b1120e30e50e (diff)
downloadperl-b4464d55c8c3facb333bef167fb547bff86d55ae.tar.gz
In Perl_do_openn(), disambiguate the two separate uses of the variable fd.
Rename the first uses of the variable fd to wanted_fd to show that the variable is not used to pass a value to later in the function.
-rw-r--r--doio.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/doio.c b/doio.c
index 37933e0e21..bb39fae2fa 100644
--- a/doio.c
+++ b/doio.c
@@ -324,6 +324,7 @@ Perl_do_openn(pTHX_ GV *gv, const char *oname, I32 len, int as_raw,
}
else {
PerlIO *that_fp = NULL;
+ int wanted_fd;
if (num_svs > 1) {
/* diag_listed_as: More than one argument to '%s' open */
Perl_croak(aTHX_ "More than one argument to '%c&' open",IoTYPE(io));
@@ -334,11 +335,11 @@ Perl_do_openn(pTHX_ GV *gv, const char *oname, I32 len, int as_raw,
SvIOK(*svp)
|| (SvPOKp(*svp) && looks_like_number(*svp))
)) {
- fd = SvUV(*svp);
+ wanted_fd = SvUV(*svp);
num_svs = 0;
}
else if (isDIGIT(*type)) {
- fd = atoi(type);
+ wanted_fd = atoi(type);
}
else {
const IO* thatio;
@@ -367,7 +368,7 @@ Perl_do_openn(pTHX_ GV *gv, const char *oname, I32 len, int as_raw,
* filehandle? Perhaps we should do
* fsetpos(src)+fgetpos(dst)? --nik */
PerlIO_flush(that_fp);
- fd = PerlIO_fileno(that_fp);
+ wanted_fd = PerlIO_fileno(that_fp);
/* When dup()ing STDIN, STDOUT or STDERR
* explicitly set appropriate access mode */
if (that_fp == PerlIO_stdout()
@@ -381,7 +382,7 @@ Perl_do_openn(pTHX_ GV *gv, const char *oname, I32 len, int as_raw,
IoTYPE(io) = IoTYPE_SOCKET;
}
else
- fd = -1;
+ wanted_fd = -1;
}
if (!num_svs)
type = NULL;
@@ -390,12 +391,12 @@ Perl_do_openn(pTHX_ GV *gv, const char *oname, I32 len, int as_raw,
}
else {
if (dodup)
- fd = PerlLIO_dup(fd);
+ wanted_fd = PerlLIO_dup(wanted_fd);
else
was_fdopen = TRUE;
- if (!(fp = PerlIO_openn(aTHX_ type,mode,fd,0,0,NULL,num_svs,svp))) {
- if (dodup && fd >= 0)
- PerlLIO_close(fd);
+ if (!(fp = PerlIO_openn(aTHX_ type,mode,wanted_fd,0,0,NULL,num_svs,svp))) {
+ if (dodup && wanted_fd >= 0)
+ PerlLIO_close(wanted_fd);
}
}
}