1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: refactor redeclared variables

Browse Source 
`lib/net.js` contained four variables that were redeclared with `var` in
the same scope. This change refactors those redeclarations so they are
scoped properly.

PR-URL: https://github.com/nodejs/node/pull/4963
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Roman Klauke <romaaan.git@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Rich Trott 2016-01-29 19:57:34 -08:00 committed by James M Snell
parent aeb2eb7783
commit 260512677b
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/net.js
View File

@ -653,10 +653,8 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
var chunks = new Array(data.length << 1);
for (var i = 0; i < data.length; i++) {
var entry = data[i];
var chunk = entry.chunk;
var enc = entry.encoding;
chunks[i * 2] = chunk;
chunks[i * 2 + 1] = enc;
chunks[i * 2] = entry.chunk;
chunks[i * 2 + 1] = entry.encoding;
}
err = this._handle.writev(req, chunks);
@ -808,14 +806,14 @@ function connect(self, address, port, addressType, localAddress, localPort) {
err = bind(localAddress, localPort);
if (err) {
var ex = exceptionWithHostPort(err, 'bind', localAddress, localPort);
const ex = exceptionWithHostPort(err, 'bind', localAddress, localPort);
self._destroy(ex);
return;
}
}
if (addressType === 6 || addressType === 4) {
var req = new TCPConnectWrap();
const req = new TCPConnectWrap();
req.oncomplete = afterConnect;
req.address = address;
req.port = port;
@ -828,7 +826,7 @@ function connect(self, address, port, addressType, localAddress, localPort) {
err = self._handle.connect6(req, address, port);
} else {
var req = new PipeConnectWrap();
const req = new PipeConnectWrap();
req.address = address;
req.oncomplete = afterConnect;
err = self._handle.connect(req, address, afterConnect);
@ -842,7 +840,7 @@ function connect(self, address, port, addressType, localAddress, localPort) {
details = sockname.address + ':' + sockname.port;
}
var ex = exceptionWithHostPort(err, 'connect', address, port, details);
const ex = exceptionWithHostPort(err, 'connect', address, port, details);
self._destroy(ex);
}
}
@ -1346,7 +1344,7 @@ Server.prototype.listen = function() {
else
listen(self, null, h.port | 0, 4, backlog, undefined, h.exclusive);
} else if (h.path && isPipeName(h.path)) {
var pipeName = self._pipeName = h.path;
const pipeName = self._pipeName = h.path;
listen(self, pipeName, -1, -1, backlog, undefined, h.exclusive);
} else {
throw new Error('Invalid listen argument: ' + h);
@ -1354,7 +1352,7 @@ Server.prototype.listen = function() {
}
} else if (isPipeName(arguments[0])) {
// UNIX socket or Windows pipe.
var pipeName = self._pipeName = arguments[0];
const pipeName = self._pipeName = arguments[0];
listen(self, pipeName, -1, -1, backlog);
} else if (arguments[1] === undefined ||