Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

net: refactor redeclared variables #4963

Closed
wants to merge 1 commit into from
Closed

net: refactor redeclared variables #4963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,10 +651,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);

Expand Down Expand Up @@ -806,14 +804,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;
Expand All @@ -826,7 +824,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);
Expand All @@ -840,7 +838,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);
}
}
Expand Down Expand Up @@ -1353,15 +1351,15 @@ 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);
}
}
} 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 ||
Expand Down