Skip to content

Commit

Permalink
buffer: refactor slowToString
Browse files Browse the repository at this point in the history
Since slowToString only has one callsite, refactor to eliminate
the use of call.

PR-URL: #11358
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Сковорода Никита Андреевич <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
  • Loading branch information
jasnell authored and italoacasas committed Feb 22, 2017
1 parent d08a8e6 commit 4ffad09
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions lib/buffer.js
Original file line number Diff line number Diff line change
Expand Up @@ -426,10 +426,10 @@ Object.defineProperty(Buffer.prototype, 'offset', {
});


function slowToString(encoding, start, end) {
function slowToString(buf, encoding, start, end) {
var loweredCase = false;

// No need to verify that "this.length <= MAX_UINT32" since it's a read-only
// No need to verify that "buf.length <= MAX_UINT32" since it's a read-only
// property of a typed array.

// This behaves neither like String nor Uint8Array in that we set start/end
Expand All @@ -438,13 +438,13 @@ function slowToString(encoding, start, end) {
// Section 13.3.3.7 Runtime Semantics: KeyedBindingInitialization.
if (start === undefined || start < 0)
start = 0;
// Return early if start > this.length. Done here to prevent potential uint32
// Return early if start > buf.length. Done here to prevent potential uint32
// coercion fail below.
if (start > this.length)
if (start > buf.length)
return '';

if (end === undefined || end > this.length)
end = this.length;
if (end === undefined || end > buf.length)
end = buf.length;

if (end <= 0)
return '';
Expand All @@ -461,27 +461,27 @@ function slowToString(encoding, start, end) {
while (true) {
switch (encoding) {
case 'hex':
return this.hexSlice(start, end);
return buf.hexSlice(start, end);

case 'utf8':
case 'utf-8':
return this.utf8Slice(start, end);
return buf.utf8Slice(start, end);

case 'ascii':
return this.asciiSlice(start, end);
return buf.asciiSlice(start, end);

case 'latin1':
case 'binary':
return this.latin1Slice(start, end);
return buf.latin1Slice(start, end);

case 'base64':
return this.base64Slice(start, end);
return buf.base64Slice(start, end);

case 'ucs2':
case 'ucs-2':
case 'utf16le':
case 'utf-16le':
return this.ucs2Slice(start, end);
return buf.ucs2Slice(start, end);

default:
if (loweredCase)
Expand All @@ -498,7 +498,7 @@ Buffer.prototype.toString = function(encoding, start, end) {
if (arguments.length === 0) {
result = this.utf8Slice(0, this.length);
} else {
result = slowToString.call(this, encoding, start, end);
result = slowToString(this, encoding, start, end);
}
if (result === undefined)
throw new Error('"toString()" failed');
Expand Down

0 comments on commit 4ffad09

Please sign in to comment.