benchmark: refactor to eliminate redeclared vars

In order to comply with linting rules used in the rest of the code base,
eliminate redeclared variables. A conservative approach is used so as to
avoid unintentional performance issues (for example, as might be seen in
some situations when using `let` instead of `var`).

PR-URL: https://github.com/nodejs/node/pull/5468
Reviewed-By: Brian White <mscdex@mscdex.net>

10 files changed, 51 insertions, 40 deletions

diff --git a/benchmark/buffers/buffer-base64-encode.js b/benchmark/buffers/buffer-base64-encode.js
index 6817123391..8e2eec3cf5 100644
--- a/benchmark/buffers/buffer-base64-encode.js
+++ b/benchmark/buffers/buffer-base64-encode.js
@@ -7,9 +7,10 @@ function main(conf) {
   var N = 64 * 1024 * 1024;
   var b = Buffer(N);
   var s = '';
-  for (var i = 0; i < 256; ++i) s += String.fromCharCode(i);
-  for (var i = 0; i < N; i += 256) b.write(s, i, 256, 'ascii');
+  var i;
+  for (i = 0; i < 256; ++i) s += String.fromCharCode(i);
+  for (i = 0; i < N; i += 256) b.write(s, i, 256, 'ascii');
   bench.start();
-  for (var i = 0; i < 32; ++i) b.toString('base64');
+  for (i = 0; i < 32; ++i) b.toString('base64');
   bench.end(64);
 }
diff --git a/benchmark/buffers/buffer-tostring.js b/benchmark/buffers/buffer-tostring.js
index 97f5fb1229..937a84b267 100644
--- a/benchmark/buffers/buffer-tostring.js
+++ b/benchmark/buffers/buffer-tostring.js
@@ -14,12 +14,13 @@ function main(conf) {
   const n = conf.n | 0;
   const buf = Buffer(len).fill(42);
 
+  var i;
   bench.start();
   if (arg) {
-    for (var i = 0; i < n; i += 1)
+    for (i = 0; i < n; i += 1)
       buf.toString('utf8');
   } else {
-    for (var i = 0; i < n; i += 1)
+    for (i = 0; i < n; i += 1)
       buf.toString();
   }
   bench.end(n);
diff --git a/benchmark/compare.js b/benchmark/compare.js
index fb27d626b5..2f1e7809ea 100644
--- a/benchmark/compare.js
+++ b/benchmark/compare.js
@@ -37,18 +37,19 @@ for (var i = 2; i < process.argv.length; i++) {
   }
 }
 
+var start, green, red, reset, end;
 if (!html) {
-  var start = '';
-  var green = '\u001b[1;32m';
-  var red = '\u001b[1;31m';
-  var reset = '\u001b[m';
-  var end = '';
+  start = '';
+  green = '\u001b[1;32m';
+  red = '\u001b[1;31m';
+  reset = '\u001b[m';
+  end = '';
 } else {
-  var start = '<pre style="background-color:#333;color:#eee">';
-  var green = '<span style="background-color:#0f0;color:#000">';
-  var red = '<span style="background-color:#f00;color:#fff">';
-  var reset = '</span>';
-  var end = '</pre>';
+  start = '<pre style="background-color:#333;color:#eee">';
+  green = '<span style="background-color:#0f0;color:#000">';
+  red = '<span style="background-color:#f00;color:#fff">';
+  reset = '</span>';
+  end = '</pre>';
 }
 
 var runBench = process.env.NODE_BENCH || 'bench';
@@ -137,7 +138,7 @@ function compare() {
 
     var r0 = util.format('%s%s: %d%s', g, nodes[0], n0.toPrecision(5), g ? reset : '');
     var r1 = util.format('%s%s: %d%s', r, nodes[1], n1.toPrecision(5), r ? reset : '');
-    var pct = c + pct + '%' + reset;
+    pct = c + pct + '%' + reset;
     var l = util.format('%s: %s %s', bench, r0, r1);
     maxLen = Math.max(l.length + pct.length, maxLen);
     return [l, pct];
diff --git a/benchmark/crypto/cipher-stream.js b/benchmark/crypto/cipher-stream.js
index affed1b462..5da6f2481e 100644
--- a/benchmark/crypto/cipher-stream.js
+++ b/benchmark/crypto/cipher-stream.js
@@ -86,13 +86,14 @@ function streamWrite(alice, bob, message, encoding, writes) {
 
 function legacyWrite(alice, bob, message, encoding, writes) {
   var written = 0;
+  var enc, dec;
   for (var i = 0; i < writes; i++) {
-    var enc = alice.update(message, encoding);
-    var dec = bob.update(enc);
+    enc = alice.update(message, encoding);
+    dec = bob.update(enc);
     written += dec.length;
   }
-  var enc = alice.final();
-  var dec = bob.update(enc);
+  enc = alice.final();
+  dec = bob.update(enc);
   written += dec.length;
   dec = bob.final();
   written += dec.length;
diff --git a/benchmark/events/ee-add-remove.js b/benchmark/events/ee-add-remove.js
index 1d8f2a8bae..99d85367cb 100644
--- a/benchmark/events/ee-add-remove.js
+++ b/benchmark/events/ee-add-remove.js
@@ -10,14 +10,15 @@ function main(conf) {
   var ee = new events.EventEmitter();
   var listeners = [];
 
-  for (var k = 0; k < 10; k += 1)
+  var k;
+  for (k = 0; k < 10; k += 1)
     listeners.push(function() {});
 
   bench.start();
   for (var i = 0; i < n; i += 1) {
-    for (var k = listeners.length; --k >= 0; /* empty */)
+    for (k = listeners.length; --k >= 0; /* empty */)
       ee.on('dummy', listeners[k]);
-    for (var k = listeners.length; --k >= 0; /* empty */)
+    for (k = listeners.length; --k >= 0; /* empty */)
       ee.removeListener('dummy', listeners[k]);
   }
   bench.end(n);
diff --git a/benchmark/fs-write-stream-throughput.js b/benchmark/fs-write-stream-throughput.js
index 197853a1fc..4c767cf666 100644
--- a/benchmark/fs-write-stream-throughput.js
+++ b/benchmark/fs-write-stream-throughput.js
@@ -39,12 +39,13 @@ function parent() {
 function runTest(dur, size, type) {
   if (type !== 'string')
     type = 'buffer';
+  var chunk;
   switch (type) {
     case 'string':
-      var chunk = new Array(size + 1).join('a');
+      chunk = new Array(size + 1).join('a');
       break;
     case 'buffer':
-      var chunk = new Buffer(size);
+      chunk = new Buffer(size);
       chunk.fill('a');
       break;
   }
diff --git a/benchmark/http_simple.js b/benchmark/http_simple.js
index a0224f7960..0f36d3b6ce 100644
--- a/benchmark/http_simple.js
+++ b/benchmark/http_simple.js
@@ -36,8 +36,9 @@ var server = module.exports = http.createServer(function(req, res) {
   var n_chunks = parseInt(commands[3], 10);
   var status = 200;
 
+  var n, i;
   if (command == 'bytes') {
-    var n = ~~arg;
+    n = ~~arg;
     if (n <= 0)
       throw new Error('bytes called with n <= 0');
     if (storedBytes[n] === undefined) {
@@ -46,19 +47,19 @@ var server = module.exports = http.createServer(function(req, res) {
     body = storedBytes[n];
 
   } else if (command == 'buffer') {
-    var n = ~~arg;
+    n = ~~arg;
     if (n <= 0)
       throw new Error('buffer called with n <= 0');
     if (storedBuffer[n] === undefined) {
       storedBuffer[n] = new Buffer(n);
-      for (var i = 0; i < n; i++) {
+      for (i = 0; i < n; i++) {
         storedBuffer[n][i] = 'C'.charCodeAt(0);
       }
     }
     body = storedBuffer[n];
 
   } else if (command == 'unicode') {
-    var n = ~~arg;
+    n = ~~arg;
     if (n <= 0)
       throw new Error('unicode called with n <= 0');
     if (storedUnicode[n] === undefined) {
@@ -93,7 +94,7 @@ var server = module.exports = http.createServer(function(req, res) {
     var len = body.length;
     var step = Math.floor(len / n_chunks) || 1;
 
-    for (var i = 0, n = (n_chunks - 1); i < n; ++i) {
+    for (i = 0, n = (n_chunks - 1); i < n; ++i) {
       res.write(body.slice(i * step, i * step + step));
     }
     res.end(body.slice((n_chunks - 1) * step));
diff --git a/benchmark/http_simple_auto.js b/benchmark/http_simple_auto.js
index 11ef6dc4f0..1f3c8e7612 100644
--- a/benchmark/http_simple_auto.js
+++ b/benchmark/http_simple_auto.js
@@ -14,7 +14,8 @@ var spawn = require('child_process').spawn;
 var port = parseInt(process.env.PORT || 8000);
 
 var fixed = '';
-for (var i = 0; i < 20 * 1024; i++) {
+var i;
+for (i = 0; i < 20 * 1024; i++) {
   fixed += 'C';
 }
 
@@ -28,25 +29,26 @@ var server = http.createServer(function(req, res) {
   var arg = commands[2];
   var n_chunks = parseInt(commands[3], 10);
   var status = 200;
+  var n;
 
   if (command == 'bytes') {
-    var n = parseInt(arg, 10);
+    n = parseInt(arg, 10);
     if (n <= 0)
       throw new Error('bytes called with n <= 0');
     if (stored[n] === undefined) {
       stored[n] = '';
-      for (var i = 0; i < n; i++) {
+      for (i = 0; i < n; i++) {
         stored[n] += 'C';
       }
     }
     body = stored[n];
 
   } else if (command == 'buffer') {
-    var n = parseInt(arg, 10);
+    n = parseInt(arg, 10);
     if (n <= 0) throw new Error('bytes called with n <= 0');
     if (storedBuffer[n] === undefined) {
       storedBuffer[n] = new Buffer(n);
-      for (var i = 0; i < n; i++) {
+      for (i = 0; i < n; i++) {
         storedBuffer[n][i] = 'C'.charCodeAt(0);
       }
     }
@@ -79,7 +81,7 @@ var server = http.createServer(function(req, res) {
     var len = body.length;
     var step = Math.floor(len / n_chunks) || 1;
 
-    for (var i = 0, n = (n_chunks - 1); i < n; ++i) {
+    for (i = 0, n = (n_chunks - 1); i < n; ++i) {
       res.write(body.slice(i * step, i * step + step));
     }
     res.end(body.slice((n_chunks - 1) * step));
diff --git a/benchmark/querystring/querystring-parse.js b/benchmark/querystring/querystring-parse.js
index 581fe7c216..590b89f307 100644
--- a/benchmark/querystring/querystring-parse.js
+++ b/benchmark/querystring/querystring-parse.js
@@ -43,14 +43,15 @@ function main(conf) {
     querystring.parse(input, '&&&&&&&&&&');
   }
 
+  var i;
   if (type !== 'multicharsep') {
     bench.start();
-    for (var i = 0; i < n; i += 1)
+    for (i = 0; i < n; i += 1)
       querystring.parse(input);
     bench.end(n);
   } else {
     bench.start();
-    for (var i = 0; i < n; i += 1)
+    for (i = 0; i < n; i += 1)
       querystring.parse(input, '&&&&&&&&&&');
     bench.end(n);
   }
diff --git a/benchmark/string_decoder/string-decoder.js b/benchmark/string_decoder/string-decoder.js
index e45016b559..b10b0a6e9c 100644
--- a/benchmark/string_decoder/string-decoder.js
+++ b/benchmark/string_decoder/string-decoder.js
@@ -22,6 +22,7 @@ function main(conf) {
   var chunks = [];
   var str = '';
   var isBase64 = (encoding === 'base64-ascii' || encoding === 'base64-utf8');
+  var i;
 
   if (encoding === 'ascii' || encoding === 'base64-ascii')
     alpha = ASC_ALPHA;
@@ -32,7 +33,7 @@ function main(conf) {
 
   var sd = new StringDecoder(isBase64 ? 'base64' : encoding);
 
-  for (var i = 0; i < inLen; ++i) {
+  for (i = 0; i < inLen; ++i) {
     if (i > 0 && (i % chunkLen) === 0 && !isBase64) {
       chunks.push(new Buffer(str, encoding));
       str = '';
@@ -53,7 +54,7 @@ function main(conf) {
   var nChunks = chunks.length;
 
   bench.start();
-  for (var i = 0; i < n; ++i) {
+  for (i = 0; i < n; ++i) {
     for (var j = 0; j < nChunks; ++j)
       sd.write(chunks[j]);
   }