Skip to content

Commit

Permalink
fs: use arrow functions instead of .bind and self
Browse files Browse the repository at this point in the history
PR-URL: #17137
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
starkwang authored and MylesBorins committed Dec 12, 2017
1 parent 1a3aadb commit 7ebaf83
Showing 1 changed file with 18 additions and 22 deletions.
40 changes: 18 additions & 22 deletions lib/fs.js
Original file line number Diff line number Diff line change
Expand Up @@ -2091,30 +2091,27 @@ ReadStream.prototype._read = function(n) {
return this.push(null);

// the actual read.
var self = this;
fs.read(this.fd, pool, pool.used, toRead, this.pos, onread);

// move the pool positions, and internal position for reading.
if (this.pos !== undefined)
this.pos += toRead;
pool.used += toRead;

function onread(er, bytesRead) {
fs.read(this.fd, pool, pool.used, toRead, this.pos, (er, bytesRead) => {
if (er) {
if (self.autoClose) {
self.destroy();
if (this.autoClose) {
this.destroy();
}
self.emit('error', er);
this.emit('error', er);
} else {
var b = null;
if (bytesRead > 0) {
self.bytesRead += bytesRead;
this.bytesRead += bytesRead;
b = thisPool.slice(start, start + bytesRead);
}

self.push(b);
this.push(b);
}
}
});

// move the pool positions, and internal position for reading.
if (this.pos !== undefined)
this.pos += toRead;
pool.used += toRead;
};

ReadStream.prototype._destroy = function(err, cb) {
Expand Down Expand Up @@ -2209,7 +2206,7 @@ fs.FileWriteStream = fs.WriteStream; // support the legacy name


WriteStream.prototype.open = function() {
fs.open(this.path, this.flags, this.mode, function(er, fd) {
fs.open(this.path, this.flags, this.mode, (er, fd) => {
if (er) {
if (this.autoClose) {
this.destroy();
Expand All @@ -2220,7 +2217,7 @@ WriteStream.prototype.open = function() {

this.fd = fd;
this.emit('open', fd);
}.bind(this));
});
};


Expand All @@ -2234,15 +2231,14 @@ WriteStream.prototype._write = function(data, encoding, cb) {
});
}

var self = this;
fs.write(this.fd, data, 0, data.length, this.pos, function(er, bytes) {
fs.write(this.fd, data, 0, data.length, this.pos, (er, bytes) => {
if (er) {
if (self.autoClose) {
self.destroy();
if (this.autoClose) {
this.destroy();
}
return cb(er);
}
self.bytesWritten += bytes;
this.bytesWritten += bytes;
cb();
});

Expand Down

0 comments on commit 7ebaf83

Please sign in to comment.