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

fs: avoid multiple conversions to string

Browse Source 
nullCheck() implicitly converts the argument to string when checking
the value, so this commit avoids any unnecessary additional (Buffer)
conversions to string.

PR-URL: https://github.com/nodejs/node/pull/10789
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
This commit is contained in:
Brian White 2017-01-13 05:07:18 -05:00
parent 21b2440176
commit 34c9fc2e4e
No known key found for this signature in database
GPG Key ID: 606D7358F94DA209
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/fs.js
View File

@ -1503,21 +1503,21 @@ function encodeRealpathResult(result, options) {
fs.realpathSync = function realpathSync(p, options) { fs.realpathSync = function realpathSync(p, options) {
options = getOptions(options, {}); options = getOptions(options, {});
handleError((p = getPathFromURL(p))); handleError((p = getPathFromURL(p)));
if (typeof p !== 'string')
p += '';
nullCheck(p); nullCheck(p);
p = p.toString('utf8');
p = pathModule.resolve(p); p = pathModule.resolve(p);
const seenLinks = {};
const knownHard = {};
const cache = options[internalFS.realpathCacheKey]; const cache = options[internalFS.realpathCacheKey];
const original = p;
const maybeCachedResult = cache && cache.get(p); const maybeCachedResult = cache && cache.get(p);
if (maybeCachedResult) { if (maybeCachedResult) {
return maybeCachedResult; return maybeCachedResult;
} }
const seenLinks = {};
const knownHard = {};
const original = p;
// current character position in p // current character position in p
var pos; var pos;
// the partial path so far, including a trailing slash if any // the partial path so far, including a trailing slash if any
@ -1614,10 +1614,10 @@ fs.realpath = function realpath(p, options, callback) {
options = getOptions(options, {}); options = getOptions(options, {});
if (handleError((p = getPathFromURL(p)), callback)) if (handleError((p = getPathFromURL(p)), callback))
return; return;
if (typeof p !== 'string')
p += '';
if (!nullCheck(p, callback)) if (!nullCheck(p, callback))
return; return;
p = p.toString('utf8');
p = pathModule.resolve(p); p = pathModule.resolve(p);
const seenLinks = {}; const seenLinks = {};