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

buffer: refactor redeclared variables

Browse Source 
A handful of variable declarations in `lib/buffer.js` redeclare the same
variable in the same scope. This change removes each redeclaration by
switching to `const`, switching to `let`, or explicitly hoisting the
`var` declaration.

PR-URL: https://github.com/nodejs/node/pull/4886
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Klauke <romaaan.git@gmail.com>
This commit is contained in:
Rich Trott 2016-01-26 13:17:31 -08:00
parent 795eeb1ccf
commit 2ac47f87a4
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/buffer.js
View File

@ -125,7 +125,7 @@ function fromString(string, encoding) {
function fromObject(obj) { function fromObject(obj) {
if (obj instanceof Buffer) { if (obj instanceof Buffer) {
var b = allocate(obj.length); const b = allocate(obj.length);
if (b.length === 0) if (b.length === 0)
return b; return b;
@ -135,9 +135,9 @@ function fromObject(obj) {
} }
if (Array.isArray(obj)) { if (Array.isArray(obj)) {
var length = obj.length; const length = obj.length;
var b = allocate(length); const b = allocate(length);
for (var i = 0; i < length; i++) for (let i = 0; i < length; i++)
b[i] = obj[i] & 255; b[i] = obj[i] & 255;
return b; return b;
} }
@ -151,13 +151,13 @@ function fromObject(obj) {
} }
if (obj.buffer instanceof ArrayBuffer || obj.length) { if (obj.buffer instanceof ArrayBuffer || obj.length) {
var length; let length;
if (typeof obj.length !== 'number' || obj.length !== obj.length) if (typeof obj.length !== 'number' || obj.length !== obj.length)
length = 0; length = 0;
else else
length = obj.length; length = obj.length;
var b = allocate(length); const b = allocate(length);
for (var i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
b[i] = obj[i] & 255; b[i] = obj[i] & 255;
} }
return b; return b;
@ -165,8 +165,8 @@ function fromObject(obj) {
if (obj.type === 'Buffer' && Array.isArray(obj.data)) { if (obj.type === 'Buffer' && Array.isArray(obj.data)) {
var array = obj.data; var array = obj.data;
var b = allocate(array.length); const b = allocate(array.length);
for (var i = 0; i < array.length; i++) for (let i = 0; i < array.length; i++)
b[i] = array[i] & 255; b[i] = array[i] & 255;
return b; return b;
} }
@ -231,7 +231,7 @@ Buffer.concat = function(list, length) {
if (length === undefined) { if (length === undefined) {
length = 0; length = 0;
for (var i = 0; i < list.length; i++) for (let i = 0; i < list.length; i++)
length += list[i].length; length += list[i].length;
} else { } else {
length = length >>> 0; length = length >>> 0;
@ -239,7 +239,7 @@ Buffer.concat = function(list, length) {
var buffer = new Buffer(length); var buffer = new Buffer(length);
var pos = 0; var pos = 0;
for (var i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
var buf = list[i]; var buf = list[i];
buf.copy(buffer, pos); buf.copy(buffer, pos);
pos += buf.length; pos += buf.length;
@ -401,10 +401,11 @@ function slowToString(encoding, start, end) {
Buffer.prototype.toString = function() { Buffer.prototype.toString = function() {
let result;
if (arguments.length === 0) { if (arguments.length === 0) {
var result = this.utf8Slice(0, this.length); result = this.utf8Slice(0, this.length);
} else { } else {
var result = slowToString.apply(this, arguments); result = slowToString.apply(this, arguments);
} }
if (result === undefined) if (result === undefined)
throw new Error('"toString()" failed'); throw new Error('"toString()" failed');