lint: separate variable declarations

Author: dougwilson

.eslintrc

@@ -37,6 +37,7 @@
     "no-unexpected-multiline": 2,
     "no-unreachable": 2,
     "no-unused-vars": 2,
+    "one-var": ["error", { "initialized": "never" }],
     "quotes": [2, "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
     "semi": [2, "always"],
     "semi-spacing": 2,

benchmark/analyze.js

@@ -81,7 +81,9 @@ function sdev() {
 }
 
 function variance() {
-  var t = 0, squares = 0, len = numbers.length;
+  var t       = 0;
+  var squares = 0;
+  var len     = numbers.length;
 
   for (var i = 0; i < len; i++) {
     var obs = numbers[i];

lib/protocol/Auth.js

@@ -35,10 +35,10 @@ Auth.token = function(password, scramble) {
 // This is a port of sql/password.c:hash_password which needs to be used for
 // pre-4.1 passwords.
 Auth.hashPassword = function(password) {
-  var nr = [0x5030, 0x5735],
-      add = 7,
-      nr2 = [0x1234, 0x5671],
-      result = Buffer.alloc(8);
+  var nr     = [0x5030, 0x5735];
+  var add    = 7;
+  var nr2    = [0x1234, 0x5671];
+  var result = Buffer.alloc(8);
 
   if (typeof password === 'string'){
     password = Buffer.from(password);
@@ -86,12 +86,12 @@ Auth.myRnd = function(r){
 };
 
 Auth.scramble323 = function(message, password) {
-  var to = Buffer.allocUnsafe(8),
-      hashPass = this.hashPassword(password),
-      hashMessage = this.hashPassword(message.slice(0, 8)),
-      seed1 = this.int32Read(hashPass, 0) ^ this.int32Read(hashMessage, 0),
-      seed2 = this.int32Read(hashPass, 4) ^ this.int32Read(hashMessage, 4),
-      r = this.randomInit(seed1, seed2);
+  var to          = Buffer.allocUnsafe(8);
+  var hashPass    = this.hashPassword(password);
+  var hashMessage = this.hashPassword(message.slice(0, 8));
+  var seed1       = this.int32Read(hashPass, 0) ^ this.int32Read(hashMessage, 0);
+  var seed2       = this.int32Read(hashPass, 4) ^ this.int32Read(hashMessage, 4);
+  var r           = this.randomInit(seed1, seed2);
 
   for (var i = 0; i < 8; i++){
     to[i] = Math.floor(this.myRnd(r) * 31) + 64;
@@ -110,17 +110,17 @@ Auth.xor32 = function(a, b){
 };
 
 Auth.add32 = function(a, b){
-  var w1 = a[1] + b[1],
-      w2 = a[0] + b[0] + ((w1 & 0xFFFF0000) >> 16);
+  var w1 = a[1] + b[1];
+  var w2 = a[0] + b[0] + ((w1 & 0xFFFF0000) >> 16);
 
   return [w2 & 0xFFFF, w1 & 0xFFFF];
 };
 
 Auth.mul32 = function(a, b){
   // based on this example of multiplying 32b ints using 16b
   // http://www.dsprelated.com/showmessage/89790/1.php
-  var w1 = a[1] * b[1],
-      w2 = (((a[1] * b[1]) >> 16) & 0xFFFF) + ((a[0] * b[1]) & 0xFFFF) + (a[1] * b[0] & 0xFFFF);
+  var w1 = a[1] * b[1];
+  var w2 = (((a[1] * b[1]) >> 16) & 0xFFFF) + ((a[0] * b[1]) & 0xFFFF) + (a[1] * b[0] & 0xFFFF);
 
   return [w2 & 0xFFFF, w1 & 0xFFFF];
 };
@@ -131,8 +131,8 @@ Auth.and32 = function(a, b){
 
 Auth.shl32 = function(a, b){
   // assume b is 16 or less
-  var w1 = a[1] << b,
-      w2 = (a[0] << b) | ((w1 & 0xFFFF0000) >> 16);
+  var w1 = a[1] << b;
+  var w2 = (a[0] << b) | ((w1 & 0xFFFF0000) >> 16);
 
   return [w2 & 0xFFFF, w1 & 0xFFFF];
 };

lib/protocol/sequences/Query.js

@@ -180,12 +180,12 @@ Query.prototype._sendLocalDataFile = function(path) {
 };
 
 Query.prototype.stream = function(options) {
-  var self = this,
-      stream;
+  var self = this;
 
   options = options || {};
   options.objectMode = true;
-  stream = new Readable(options);
+
+  var stream = new Readable(options);
 
   stream._read = function() {
     self._connection && self._connection.resume();