buffer: refactor redeclared variables

Trott · rvagg · commit bafc86f00e30 · 2016-02-08T23:01:00.000+11:00
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: #4886 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Roman Klauke <romaaan.git@gmail.com>
diff --git a/lib/buffer.js b/lib/buffer.js
@@ -120,7 +120,7 @@ function fromString(string, encoding){
 
 function fromObject(obj){
 if (obj instanceof Buffer){
- var b = allocate(obj.length);
+ const b = allocate(obj.length);
 
 if (b.length === 0)
 return b;
@@ -130,9 +130,9 @@ function fromObject(obj){
 }
 
 if (Array.isArray(obj)){
- var length = obj.length;
- var b = allocate(length);
- for (var i = 0; i < length; i++)
+ const length = obj.length;
+ const b = allocate(length);
+ for (let i = 0; i < length; i++)
 b[i] = obj[i] & 255;
 return b;
 }
@@ -146,22 +146,22 @@ function fromObject(obj){
 }
 
 if (obj.buffer instanceof ArrayBuffer || obj.length){
- var length;
+ let length;
 if (typeof obj.length !== 'number' || obj.length !== obj.length)
 length = 0;
 else
 length = obj.length;
- var b = allocate(length);
- for (var i = 0; i < length; i++){
+ const b = allocate(length);
+ for (let i = 0; i < length; i++){
 b[i] = obj[i] & 255;
 }
 return b;
 }
 
 if (obj.type === 'Buffer' && Array.isArray(obj.data)){
 var array = obj.data;
- var b = allocate(array.length);
- for (var i = 0; i < array.length; i++)
+ const b = allocate(array.length);
+ for (let i = 0; i < array.length; i++)
 b[i] = array[i] & 255;
 return b;
 }
@@ -226,15 +226,15 @@ Buffer.concat = function(list, length){
 
 if (length === undefined){
 length = 0;
- for (var i = 0; i < list.length; i++)
+ for (let i = 0; i < list.length; i++)
 length += list[i].length;
 } else{
 length = length >>> 0;
 }
 
 var buffer = new Buffer(length);
 var pos = 0;
- for (var i = 0; i < list.length; i++){
+ for (let i = 0; i < list.length; i++){
 var buf = list[i];
 buf.copy(buffer, pos);
 pos += buf.length;
@@ -396,10 +396,11 @@ function slowToString(encoding, start, end){
 
 
 Buffer.prototype.toString = function(){
+ let result;
 if (arguments.length === 0){
- var result = this.utf8Slice(0, this.length);
+ result = this.utf8Slice(0, this.length);
 } else{
- var result = slowToString.apply(this, arguments);
+ result = slowToString.apply(this, arguments);
 }
 if (result === undefined)
 throw new Error('toString failed');

-Original file line number
+Diff line change
 functionfromObject(obj){
 if(objinstanceofBuffer){
 -varb=allocate(obj.length);
 +constb=allocate(obj.length);
 if(b.length===0)
 returnb;
+}
 if(Array.isArray(obj)){
 -varlength=obj.length;
 -varb=allocate(length);
 -for(vari=0;i<length;i++)
 +constlength=obj.length;
 +constb=allocate(length);
 +for(leti=0;i<length;i++)
 b[i]=obj[i]&255;
 returnb;
+}
+}
 if(obj.bufferinstanceofArrayBuffer||obj.length){
 -varlength;
 +letlength;
 if(typeofobj.length!=='number'||obj.length!==obj.length)
 length=0;
 else
 length=obj.length;
 -varb=allocate(length);
 -for(vari=0;i<length;i++){
 +constb=allocate(length);
 +for(leti=0;i<length;i++){
 b[i]=obj[i]&255;
+}
 returnb;
+}
 if(obj.type==='Buffer'&&Array.isArray(obj.data)){
 vararray=obj.data;
 -varb=allocate(array.length);
 -for(vari=0;i<array.length;i++)
 +constb=allocate(array.length);
 +for(leti=0;i<array.length;i++)
 b[i]=array[i]&255;
 returnb;
+}
 if(length===undefined){
 length=0;
 -for(vari=0;i<list.length;i++)
 +for(leti=0;i<list.length;i++)
 length+=list[i].length;
 }else{
 length=length>>>0;
+}
 varbuffer=newBuffer(length);
 varpos=0;
 -for(vari=0;i<list.length;i++){
 +for(leti=0;i<list.length;i++){
 varbuf=list[i];
 buf.copy(buffer,pos);
 pos+=buf.length;
 Buffer.prototype.toString=function(){
 +letresult;
 if(arguments.length===0){
 -varresult=this.utf8Slice(0,this.length);
 +result=this.utf8Slice(0,this.length);
 }else{
 -varresult=slowToString.apply(this,arguments);
 +result=slowToString.apply(this,arguments);
+}
 if(result===undefined)
 thrownewError('toString failed');