Fix hlint warnings.

diff --git a/src/DNS.hs b/src/DNS.hs
index 5222cbec3f3a54c1d8b334bb52b615e56b1cc2e2..f649e0ad5da96ea4c8ab34b250eeaf9ab2948044 100644 (file)
--- a/src/DNS.hs
+++ b/src/DNS.hs
@@ -6,6 +6,7 @@ module DNS (
   )
 where
 
   )
 where
 

+import Control.Monad (liftM)

 import qualified Data.ByteString.Char8 as BS (
   append,
   last,
 import qualified Data.ByteString.Char8 as BS (
   append,
   last,


@@ -22,7 +23,7 @@ type LookupResult = (Domain, Maybe [Domain])
 
 lookupMX' :: Resolver -> Domain -> IO LookupResult
 lookupMX' resolver domain =
 
 lookupMX' :: Resolver -> Domain -> IO LookupResult
 lookupMX' resolver domain =

-  lookupMX resolver domain >>= return . pair_em . drop_priority
+  liftM (pair_em . drop_priority) $ lookupMX resolver domain

   where
     drop_priority :: Maybe [(Domain, Int)] -> Maybe [Domain]
     drop_priority = fmap (map fst)
   where
     drop_priority :: Maybe [(Domain, Int)] -> Maybe [Domain]
     drop_priority = fmap (map fst)


@@ -33,7 +34,7 @@ lookupMX' resolver domain =
 -- This function keeps the domain matches with its NS records.
 lookupNS' :: Resolver -> Domain -> IO LookupResult
 lookupNS' resolver domain =
 -- This function keeps the domain matches with its NS records.
 lookupNS' :: Resolver -> Domain -> IO LookupResult
 lookupNS' resolver domain =

-  lookupNS resolver domain >>= return . pair_em
+  liftM pair_em $ lookupNS resolver domain

   where
     pair_em :: a -> (Domain, a)
     pair_em = (,) domain
   where
     pair_em :: a -> (Domain, a)
     pair_em = (,) domain

diff --git a/src/Main.hs b/src/Main.hs
index 0c215b758a59501b6d4c8bd049a5dd4cab53e9ee..4da383352360ee4a37a552805a5da88897c27c4f 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -4,6 +4,7 @@ where
 import Control.Concurrent.ParallelIO.Global (
   parallel,
   stopGlobalPool )
 import Control.Concurrent.ParallelIO.Global (
   parallel,
   stopGlobalPool )

+import Control.Monad (unless)

 import qualified Data.ByteString.Char8 as BS (
   getContents,
   pack,
 import qualified Data.ByteString.Char8 as BS (
   getContents,
   pack,


@@ -30,12 +31,11 @@ report :: (Domain, Maybe [Domain]) -> IO ()
 report (d, Nothing) =
   putStrLn $ "Domain " ++ (show d) ++ " not delegated."
 report (d, Just leftovers) =
 report (d, Nothing) =
   putStrLn $ "Domain " ++ (show d) ++ " not delegated."
 report (d, Just leftovers) =

-  if null leftovers
-  then return ()
-  else putStrLn $ "Domain " ++
-                  (show d) ++
-                  " delegates somewhere else: " ++
-                  (join " " (map show leftovers))
+  unless (null leftovers) $
+    putStrLn $ "Domain " ++
+               (show d) ++
+               " delegates somewhere else: " ++
+               (join " " (map show leftovers))

 
 clean :: [Domain] -- ^ List of delegates, @ds@
       -> LookupResult
 
 clean :: [Domain] -- ^ List of delegates, @ds@
       -> LookupResult