more lint

lib/dns.js

@@ -29,7 +29,7 @@ function updateTimer() {
   var max = 20000;
   var timeout = channel.timeout(max);
   timer.start(timeout, 0);
-};
+}
 
 
 var channel = new dns.Channel({SOCK_STATE_CB: function(socket, read, write) {
@@ -39,17 +39,16 @@ var channel = new dns.Channel({SOCK_STATE_CB: function (socket, read, write) {
     watcher = watchers[socket].watcher;
   } else {
     watcher = new IOWatcher();
-    watchers[socket] = { read: read
+    watchers[socket] = { read: read,
-                       , write: write
+                         write: write,
-                       , watcher: watcher
+                         watcher: watcher };
-                       };
 
     watcher.callback = function(read, write)  {
       channel.processFD(read ? socket : dns.SOCKET_BAD,
                         write ? socket : dns.SOCKET_BAD);
       updateTimer();
     };
-  };
+  }
 
   watcher.stop();
 
@@ -90,7 +89,7 @@ function familyToSym(family) {
     family = (family === 6) ? dns.AF_INET6 : dns.AF_INET;
   }
   return family;
-};
+}
 
 
 exports.getHostByName = function(domain, family/*=4*/, callback) {
@@ -157,7 +156,7 @@ exports.lookup = function (domain, family, callback) {
         callback(err, []);
       }
     });
-    return
+    return;
   }
 
   // first resolve names for v4 and if that fails, try v6
@@ -165,8 +164,7 @@ exports.lookup = function (domain, family, callback) {
     if (domains4 && domains4.length) {
       callback(null, domains4[0], 4);
     } else {
-      channel.getHostByName(domain, dns.AF_INET6,
+      channel.getHostByName(domain, dns.AF_INET6, function(err, domains6) {
-                            function (err, domains6) {
         if (domains6 && domains6.length) {
           callback(null, domains6[0], 6);
         } else {
@@ -181,38 +179,50 @@ exports.lookup = function (domain, family, callback) {
 exports.resolve4 = function(domain, callback) {
   channel.query(domain, dns.A, callback);
 };
+
+
 exports.resolve6 = function(domain, callback) {
   channel.query(domain, dns.AAAA, callback);
 };
+
+
 exports.resolveMx = function(domain, callback) {
   channel.query(domain, dns.MX, callback);
 };
+
+
 exports.resolveTxt = function(domain, callback) {
   channel.query(domain, dns.TXT, callback);
 };
+
+
 exports.resolveSrv = function(domain, callback) {
   channel.query(domain, dns.SRV, callback);
 };
+
+
 exports.reverse = function(domain, callback) {
   channel.query(domain, dns.PTR, callback);
 };
+
+
 exports.resolveNs = function(domain, callback) {
   channel.query(domain, dns.NS, callback);
 };
+
+
 exports.resolveCname = function(domain, callback) {
   channel.query(domain, dns.CNAME, callback);
 };
 
-var resolveMap = {
+var resolveMap = { A: exports.resolve4,
-  'A'     : exports.resolve4,
+                   AAAA: exports.resolve6,
-  'AAAA'  : exports.resolve6,
+                   MX: exports.resolveMx,
-  'MX'    : exports.resolveMx,
+                   TXT: exports.resolveTxt,
-  'TXT'   : exports.resolveTxt,
+                   SRV: exports.resolveSrv,
-  'SRV'   : exports.resolveSrv,
+                   PTR: exports.resolvePtr,
-  'PTR'   : exports.resolvePtr,
+                   NS: exports.resolveNs,
-  'NS'    : exports.resolveNs,
+                   CNAME: exports.resolveCname };
-  'CNAME' : exports.resolveCname
-};
 
 // ERROR CODES
 exports.NODATA = dns.NODATA;
@@ -224,7 +234,6 @@ exports.TIMEOUT     = dns.TIMEOUT;
 exports.CONNREFUSED = dns.CONNREFUSED;
 exports.NOMEM = dns.NOMEM;
 exports.DESTRUCTION = dns.DESTRUCTION;
-
 exports.NOTIMP = dns.NOTIMP;
 exports.EREFUSED = dns.EREFUSED;
 exports.SERVFAIL = dns.SERVFAIL;

lib/events.js

@@ -65,7 +65,7 @@ EventEmitter.prototype.addListener = function (type, listener) {
 
   // To avoid recursion in the case that type == "newListeners"! Before
   // adding it to the listeners, first emit "newListeners".
-  this.emit("newListener", type, listener);
+  this.emit('newListener', type, listener);
 
   if (!this._events[type]) {
     // Optimize the case of one listener. Don't need the extra array object.

lib/freelist.js

@@ -9,8 +9,8 @@ exports.FreeList = function(name, max, constructor) {
 
 exports.FreeList.prototype.alloc = function() {
   //debug("alloc " + this.name + " " + this.list.length);
-  return this.list.length ? this.list.shift()
+  return this.list.length ? this.list.shift() :
-                          : this.constructor.apply(this, arguments);
+                            this.constructor.apply(this, arguments);
 };
 
 

lib/fs.js

@@ -49,15 +49,18 @@ fs.readFile = function (path, encoding_) {
   var readStream = fs.createReadStream(path);
   var buffers = [];
   var nread = 0;
-  readStream.on("data", function (chunk) {
+
+  readStream.on('data', function(chunk) {
     buffers.push(chunk);
     nread += chunk.length;
   });
-  readStream.on("error", function (er) {
+
+  readStream.on('error', function(er) {
     callback(er);
     readStream.destroy();
   });
-  readStream.on("end", function () {
+
+  readStream.on('end', function() {
     // copy all the buffers into one
     var buffer;
     switch (buffers.length) {
@@ -113,7 +116,8 @@ fs.readFileSync = function (path, encoding) {
       offset += i._bytesRead;
     });
   } else if (buffers.length) {
-    //buffers has exactly 1 (possibly zero length) buffer, so this should be a shortcut
+    // buffers has exactly 1 (possibly zero length) buffer, so this should
+    // be a shortcut
     buffer = buffers[0].slice(0, buffers[0]._bytesRead);
   } else {
     buffer = new Buffer(0);
@@ -131,13 +135,26 @@ function stringToFlags(flag) {
     return flag;
   }
   switch (flag) {
-    case "r": return constants.O_RDONLY;
+    case 'r':
-    case "r+": return constants.O_RDWR;
+      return constants.O_RDONLY;
-    case "w": return constants.O_CREAT | constants.O_TRUNC | constants.O_WRONLY;
+
-    case "w+": return constants.O_CREAT | constants.O_TRUNC | constants.O_RDWR;
+    case 'r+':
-    case "a": return constants.O_APPEND | constants.O_CREAT | constants.O_WRONLY;
+      return constants.O_RDWR;
-    case "a+": return constants.O_APPEND | constants.O_CREAT | constants.O_RDWR;
+
-    default: throw new Error("Unknown file open flag: " + flag);
+    case 'w':
+      return constants.O_CREAT | constants.O_TRUNC | constants.O_WRONLY;
+
+    case 'w+':
+      return constants.O_CREAT | constants.O_TRUNC | constants.O_RDWR;
+
+    case 'a':
+      return constants.O_APPEND | constants.O_CREAT | constants.O_WRONLY;
+
+    case 'a+':
+      return constants.O_APPEND | constants.O_CREAT | constants.O_RDWR;
+
+    default:
+      throw new Error('Unknown file open flag: ' + flag);
   }
 }
 
@@ -180,9 +197,7 @@ fs.read = function (fd, buffer, offset, length, position, callback) {
     callback = function(err, bytesRead) {
       if (!cb) return;
 
-      var str = (bytesRead > 0)
+      var str = (bytesRead > 0) ? buffer.toString(encoding, 0, bytesRead) : '';
-        ? buffer.toString(encoding, 0, bytesRead)
-        : '';
 
       (cb)(err, str, bytesRead);
     };
@@ -209,9 +224,7 @@ fs.readSync = function (fd, buffer, offset, length, position) {
     return r;
   }
 
-  var str = (r > 0)
+  var str = (r > 0) ? buffer.toString(encoding, 0, r) : '';
-      ? buffer.toString(encoding, 0, r)
-      : '';
   return [str, r];
 };
 
@@ -420,9 +433,9 @@ fs.writeFile = function (path, data, encoding_, callback) {
 };
 
 fs.writeFileSync = function(path, data, encoding) {
-  var fd = fs.openSync(path, "w");
+  var fd = fs.openSync(path, 'w');
   if (!Buffer.isBuffer(data)) {
-    data = new Buffer(data, encoding || "utf8")
+    data = new Buffer(data, encoding || 'utf8');
   }
   var written = 0;
   var length = data.length;
@@ -442,7 +455,7 @@ fs.watchFile = function (filename) {
   var options;
   var listener;
 
-  if ("object" == typeof arguments[1]) {
+  if ('object' == typeof arguments[1]) {
     options = arguments[1];
     listener = arguments[2];
   } else {
@@ -460,7 +473,7 @@ fs.watchFile = function (filename) {
     stat = statWatchers[filename];
     stat.start(filename, options.persistent, options.interval);
   }
-  stat.addListener("change", listener);
+  stat.addListener('change', listener);
   return stat;
 };
 
@@ -499,11 +512,14 @@ function realpathSync (p) {
   for (var i = 0; i < p.length; i++) {
     // skip over empty path parts.
     if (p[i] === '') continue;
+
     var part = path.join.apply(path, buf.concat(p[i]));
+
     if (knownHard[part]) {
       buf.push(p[i]);
       continue;
     }
+
     var stat = fs.lstatSync(part);
     if (!stat.isSymbolicLink()) {
       // not a symlink. easy.
@@ -511,11 +527,13 @@ function realpathSync (p) {
       buf.push(p[i]);
       continue;
     }
+
     var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
     if (!seenLinks[id]) {
       fs.statSync(part);
       seenLinks[id] = fs.readlinkSync(part);
     }
+
     var target = seenLinks[id];
     if (target.charAt(0) === '/') {
       // absolute. Start over.
@@ -524,9 +542,10 @@ function realpathSync (p) {
       i = -1;
       continue;
     }
+
     // not absolute.  join and splice.
-    if (i === 0 && p[i].charAt(0) === "/") {
+    if (i === 0 && p[i].charAt(0) === '/') {
-      target = "/"+target;
+      target = '/' + target;
     }
     target = path.split(target);
     Array.prototype.splice.apply(p, [i, 1].concat(target));
@@ -552,6 +571,7 @@ function realpath (p, cb) {
   // NB: path.length changes.
   var i = -1;
   var part;
+
   LOOP();
   function LOOP() {
     i++;
@@ -565,6 +585,7 @@ function realpath (p, cb) {
     }
     return fs.lstat(part, gotStat);
   }
+
   function gotStat(er, stat) {
     if (er) return cb(er);
     if (!stat.isSymbolicLink()) {
@@ -573,15 +594,17 @@ function realpath (p, cb) {
       buf.push(p[i]);
       return process.nextTick(LOOP);
     }
+
     var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
     if (seenLinks[id]) return gotTarget(null, seenLinks[id]);
     fs.stat(part, function(er) {
-      if (er) return cb(er)
+      if (er) return cb(er);
       fs.readlink(part, function(er, target) {
         gotTarget(er, seenLinks[id] = target);
       });
-    })
+    });
   }
+
   function gotTarget(er, target) {
     if (er) return cb(er);
     if (target.charAt(0) === '/') {
@@ -592,8 +615,8 @@ function realpath (p, cb) {
       return process.nextTick(LOOP);
     }
     // not absolute.  join and splice.
-    if (i === 0 && p[i].charAt(0) === "/") {
+    if (i === 0 && p[i].charAt(0) === '/') {
-      target = "/"+target;
+      target = '/' + target;
     }
     target = path.split(target);
     Array.prototype.splice.apply(p, [i, 1].concat(target));
@@ -602,12 +625,14 @@ function realpath (p, cb) {
     buf = [];
     return process.nextTick(LOOP);
   }
+
   function exit() {
     cb(null, path.join(buf.join('/') || '/'));
   }
 }
 
 var pool;
+
 function allocNewPool() {
   pool = new Buffer(kPoolSize);
   pool.used = 0;
@@ -648,8 +673,8 @@ var ReadStream = fs.ReadStream = function(path, options) {
 
   if (this.start !== undefined || this.end !== undefined) {
     if (this.start === undefined || this.end === undefined) {
-      this.emit('error',
+      this.emit('error', new Error('Both start and end are needed ' +
-        new Error('Both start and end are needed for range streaming.'));
+                                   'for range streaming.'));
     } else if (this.start > this.end) {
       this.emit('error', new Error('start must be <= end'));
     } else {
@@ -678,7 +703,7 @@ util.inherits(ReadStream, Stream);
 fs.FileReadStream = fs.ReadStream; // support the legacy name
 
 ReadStream.prototype.setEncoding = function(encoding) {
-  var StringDecoder = require("string_decoder").StringDecoder; // lazy load
+  var StringDecoder = require('string_decoder').StringDecoder; // lazy load
   this._decoder = new StringDecoder(encoding);
 };