more lint

1 files changed, 58 insertions, 49 deletions

diff --git a/lib/dns.js b/lib/dns.js
index 66bb6ca23b..8d7eef2a64 100644
--- a/lib/dns.js
+++ b/lib/dns.js
@@ -9,12 +9,12 @@ var Timer = process.binding('timer').Timer;
 
 var timer = new Timer();
 
-timer.callback = function () {
+timer.callback = function() {
   var sockets = Object.keys(activeWatchers);
   for (var i = 0, l = sockets.length; i < l; i++) {
     var socket = sockets[i];
     var s = parseInt(socket, 10);
-    channel.processFD(watchers[socket].read  ? s : dns.SOCKET_BAD,
+    channel.processFD(watchers[socket].read ? s : dns.SOCKET_BAD,
                       watchers[socket].write ? s : dns.SOCKET_BAD);
   }
   updateTimer();
@@ -29,27 +29,26 @@ 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) {
+var channel = new dns.Channel({SOCK_STATE_CB: function(socket, read, write) {
   var watcher;
 
   if (socket in watchers) {
     watcher = watchers[socket].watcher;
   } else {
     watcher = new IOWatcher();
-    watchers[socket] = { read: read
-                       , write: write
-                       , watcher: watcher
-                       };
+    watchers[socket] = { read: read,
+                         write: write,
+                         watcher: watcher };
 
     watcher.callback = function(read, write)  {
-      channel.processFD(read  ? socket : dns.SOCKET_BAD,
+      channel.processFD(read ? socket : dns.SOCKET_BAD,
                         write ? socket : dns.SOCKET_BAD);
       updateTimer();
     };
-  };
+  }
 
   watcher.stop();
 
@@ -65,7 +64,7 @@ var channel = new dns.Channel({SOCK_STATE_CB: function (socket, read, write) {
   updateTimer();
 }});
 
-exports.resolve = function (domain, type_, callback_) {
+exports.resolve = function(domain, type_, callback_) {
   var type, callback;
   if (typeof(type_) == 'string') {
     type = type_;
@@ -90,16 +89,16 @@ function familyToSym(family) {
     family = (family === 6) ? dns.AF_INET6 : dns.AF_INET;
   }
   return family;
-};
+}
 
 
-exports.getHostByName = function (domain, family/*=4*/, callback) {
+exports.getHostByName = function(domain, family/*=4*/, callback) {
   if (typeof family === 'function') { callback = family; family = null; }
   channel.getHostByName(domain, familyToSym(family), callback);
 };
 
 
-exports.getHostByAddr = function (address, family/*=4*/, callback) {
+exports.getHostByAddr = function(address, family/*=4*/, callback) {
   if (typeof family === 'function') { callback = family; family = null; }
   channel.getHostByAddr(address, familyToSym(family), callback);
 };
@@ -107,7 +106,7 @@ exports.getHostByAddr = function (address, family/*=4*/, callback) {
 
 // Easy DNS A/AAAA look up
 // lookup(domain, [family,] callback)
-exports.lookup = function (domain, family, callback) {
+exports.lookup = function(domain, family, callback) {
   // parse arguments
   if (arguments.length === 2) {
     callback = family;
@@ -137,7 +136,7 @@ exports.lookup = function (domain, family, callback) {
   if (/\w\.local\.?$/.test(domain)) {
     // ANNOYING: In the case of mDNS domains use NSS in the thread pool.
     // I wish c-ares had better support.
-    process.binding('net').getaddrinfo(domain, 4, function (err, domains4) {
+    process.binding('net').getaddrinfo(domain, 4, function(err, domains4) {
       callback(err, domains4[0], 4);
     });
     return;
@@ -146,7 +145,7 @@ exports.lookup = function (domain, family, callback) {
   if (family) {
     // resolve names for explicit address family
     var af = familyToSym(family);
-    channel.getHostByName(domain, af, function (err, domains) {
+    channel.getHostByName(domain, af, function(err, domains) {
       if (!err && domains && domains.length) {
         if (family !== net.isIP(domains[0])) {
           callback(new Error('not found'), []);
@@ -157,16 +156,15 @@ exports.lookup = function (domain, family, callback) {
         callback(err, []);
       }
     });
-    return
+    return;
   }
 
   // first resolve names for v4 and if that fails, try v6
-  channel.getHostByName(domain, dns.AF_INET, function (err, domains4) {
+  channel.getHostByName(domain, dns.AF_INET, function(err, domains4) {
     if (domains4 && domains4.length) {
       callback(null, domains4[0], 4);
     } else {
-      channel.getHostByName(domain, dns.AF_INET6,
-                            function (err, domains6) {
+      channel.getHostByName(domain, dns.AF_INET6, function(err, domains6) {
         if (domains6 && domains6.length) {
           callback(null, domains6[0], 6);
         } else {
@@ -178,53 +176,64 @@ exports.lookup = function (domain, family, callback) {
 };
 
 
-exports.resolve4    = function(domain, callback) {
+exports.resolve4 = function(domain, callback) {
   channel.query(domain, dns.A, callback);
 };
-exports.resolve6    = function(domain, callback) {
+
+
+exports.resolve6 = function(domain, callback) {
   channel.query(domain, dns.AAAA, callback);
 };
-exports.resolveMx   = function(domain, callback) {
+
+
+exports.resolveMx = function(domain, callback) {
   channel.query(domain, dns.MX, callback);
 };
-exports.resolveTxt  = function(domain, callback) {
+
+
+exports.resolveTxt = function(domain, callback) {
   channel.query(domain, dns.TXT, callback);
 };
-exports.resolveSrv  = function(domain, callback) {
+
+
+exports.resolveSrv = function(domain, callback) {
   channel.query(domain, dns.SRV, callback);
 };
-exports.reverse     = function(domain, callback) {
+
+
+exports.reverse = function(domain, callback) {
   channel.query(domain, dns.PTR, callback);
 };
-exports.resolveNs   = function(domain, 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 = {
-  'A'     : exports.resolve4,
-  'AAAA'  : exports.resolve6,
-  'MX'    : exports.resolveMx,
-  'TXT'   : exports.resolveTxt,
-  'SRV'   : exports.resolveSrv,
-  'PTR'   : exports.resolvePtr,
-  'NS'    : exports.resolveNs,
-  'CNAME' : exports.resolveCname
-};
+var resolveMap = { A: exports.resolve4,
+                   AAAA: exports.resolve6,
+                   MX: exports.resolveMx,
+                   TXT: exports.resolveTxt,
+                   SRV: exports.resolveSrv,
+                   PTR: exports.resolvePtr,
+                   NS: exports.resolveNs,
+                   CNAME: exports.resolveCname };
 
 // ERROR CODES
-exports.NODATA      = dns.NODATA;
-exports.FORMERR     = dns.FORMERR;
-exports.BADRESP     = dns.BADRESP;
-exports.NOTFOUND    = dns.NOTFOUND;
-exports.BADNAME     = dns.BADNAME;
-exports.TIMEOUT     = dns.TIMEOUT;
+exports.NODATA = dns.NODATA;
+exports.FORMERR = dns.FORMERR;
+exports.BADRESP = dns.BADRESP;
+exports.NOTFOUND = dns.NOTFOUND;
+exports.BADNAME = dns.BADNAME;
+exports.TIMEOUT = dns.TIMEOUT;
 exports.CONNREFUSED = dns.CONNREFUSED;
-exports.NOMEM       = dns.NOMEM;
+exports.NOMEM = dns.NOMEM;
 exports.DESTRUCTION = dns.DESTRUCTION;
-
-exports.NOTIMP      = dns.NOTIMP;
-exports.EREFUSED    = dns.EREFUSED;
-exports.SERVFAIL    = dns.SERVFAIL;
+exports.NOTIMP = dns.NOTIMP;
+exports.EREFUSED = dns.EREFUSED;
+exports.SERVFAIL = dns.SERVFAIL;