type signatures for Hosts module

1 files changed, 13 insertions, 3 deletions

diff --git a/Hosts.hs b/Hosts.hs
index ee4d154..5b117c7 100644
--- a/Hosts.hs
+++ b/Hosts.hs
@@ -30,17 +30,15 @@ import qualified Data.Map as Map
 import           Data.Map (Map)
 import qualified Data.ByteString.Lazy.Char8 as L
 import System.IO.Unsafe (unsafePerformIO)
-import Control.Exception as Exception (IOException(..),catch)
 import Control.Applicative ( (<$>), (<*>) )
 import Control.Monad (mplus)
 import Network.Socket
+import ControlMaybe ( handleIO_ )
 
 #if ! MIN_VERSION_network(2,4,0)
 deriving instance Ord SockAddr
 #endif
 
-handleIO_ h a = Exception.catch a (\(_ :: IOException) -> h)
-
 inet_pton :: String -> Maybe SockAddr
 inet_pton p = n
  where
@@ -68,8 +66,10 @@ data Hosts = Hosts
 instance Show Hosts where
     show = L.unpack . encode
 
+encode :: Hosts -> L.ByteString
 encode = L.unlines . map snd . Map.assocs . numline
 
+parseLine :: L.ByteString -> (Maybe SockAddr, [L.ByteString])
 parseLine s = (addr,names)
  where
     (addr0,names) = splitAt 1 $ L.words (uncom s)
@@ -80,6 +80,7 @@ parseLine s = (addr,names)
         
     uncom s = fst $ L.break (=='#') s
 
+empty :: Hosts
 empty = Hosts { lineCount = 0
               , numline = Map.empty
               , addrnum = Map.empty
@@ -92,6 +93,7 @@ parseHosts fname = do
     return $ decode input
 -}
 
+decode :: L.ByteString -> Hosts
 decode input = 
     let ls = L.lines input
         ans = map (\l->(parseLine l,l)) ls
@@ -118,6 +120,8 @@ hasName name hosts = Map.member name $ namenum hosts
 hasAddr :: SockAddr -> Hosts -> Bool
 hasAddr addr hosts = Map.member addr $ addrnum hosts
 
+scrubName ::
+  ([L.ByteString] -> [L.ByteString]) -> L.ByteString -> L.ByteString
 scrubName f line = line'
  where
     (x,ign) = L.break (=='#') line
@@ -140,8 +144,10 @@ scrubName f line = line'
                                         else "# " <> vs''
                          in L.concat (a'++ws'') <> vs'''
 
+assignName :: SockAddr -> L.ByteString -> Hosts -> Hosts
 assignName addr name hosts = assignName0 False addr name hosts
 
+assignName0 :: Bool -> SockAddr -> L.ByteString -> Hosts -> Hosts
 assignName0 iscannon addr name hosts = hosts'
  where
     ns = Map.lookup name (namenum hosts) 
@@ -170,10 +176,12 @@ assignName0 iscannon addr name hosts = hosts'
               line = L.pack (inet_ntop addr) <> " " <> name
               cons v xs = Just $ maybe [v] (v:) xs
 
+assignNewName :: SockAddr -> L.ByteString -> Hosts -> Hosts
 assignNewName addr name hosts = 
     if hasName name hosts then hosts
                           else assignName0 True addr name hosts
 
+appendName :: Bool -> L.ByteString -> Hosts -> Int -> Hosts
 appendName iscannon name hosts num = hosts
         { numline = Map.adjust (scrubName f) num (numline hosts)
         , namenum = Map.alter (cons num) name (namenum hosts)
@@ -204,6 +212,7 @@ diff as bs = cs
 namesForAddress :: SockAddr -> Hosts -> [L.ByteString]
 namesForAddress addr hosts = snd $ _namesForAddress addr hosts
 
+_namesForAddress :: SockAddr -> Hosts -> (Int, [L.ByteString])
 _namesForAddress addr (Hosts {numline=numline, addrnum=addrnum}) = ns
  where
     ns = maybe (-1,[]) id $ do
@@ -212,6 +221,7 @@ _namesForAddress addr (Hosts {numline=numline, addrnum=addrnum}) = ns
         return (n, snd $ parseLine line)
 
 
+plus :: Hosts -> Hosts -> Hosts
 plus a b = Map.foldlWithKey' mergeAddr a (addrnum b)
  where
     mergeAddr a addr bnum = a'