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

fs: remove unused branches

Browse Source 
In a few places the code was refactored to use `maybeCallback` which
always returns a function. Checking for `if (callback)` always returns
true anyway.

PR-URL: https://github.com/nodejs/node/pull/4795
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: thefourtheye <thechargingvolcano@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
This commit is contained in:
Benjamin Gruenbaum 2016-01-21 17:35:10 +02:00 committed by Roman Reiss
parent 922d53897d
commit c00d08f5ec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/fs.js
View File

@ -1160,16 +1160,16 @@ function writeAll(fd, isUserFd, buffer, offset, length, position, callback_) {
fs.write(fd, buffer, offset, length, position, function(writeErr, written) { fs.write(fd, buffer, offset, length, position, function(writeErr, written) {
if (writeErr) { if (writeErr) {
if (isUserFd) { if (isUserFd) {
if (callback) callback(writeErr); callback(writeErr);
} else { } else {
fs.close(fd, function() { fs.close(fd, function() {
if (callback) callback(writeErr); callback(writeErr);
}); });
} }
} else { } else {
if (written === length) { if (written === length) {
if (isUserFd) { if (isUserFd) {
if (callback) callback(null); callback(null);
} else { } else {
fs.close(fd, callback); fs.close(fd, callback);
} }
@ -1207,7 +1207,7 @@ fs.writeFile = function(path, data, options, callback_) {
fs.open(path, flag, options.mode, function(openErr, fd) { fs.open(path, flag, options.mode, function(openErr, fd) {
if (openErr) { if (openErr) {
if (callback) callback(openErr); callback(openErr);
} else { } else {
writeFd(fd, false); writeFd(fd, false);
} }