keep hlint happy

diff --git a/src/FuncTorrent/Metainfo.hs b/src/FuncTorrent/Metainfo.hs
index daf008f25181b5237ca485891e5bb252cde32271..9eb9955bfff5e4463111e75b5d387599d3f09e73 100644 (file)
--- a/src/FuncTorrent/Metainfo.hs
+++ b/src/FuncTorrent/Metainfo.hs
@@ -83,7 +83,7 @@ getAnnounceList (Just (Bdict _)) = []
 
 torrentToMetainfo :: ByteString -> Either String Metainfo
 torrentToMetainfo s =
-  case (decode s) of
+  case decode s of
    Right d ->
      mkMetaInfo d
    Left e ->

diff --git a/src/FuncTorrent/Peer.hs b/src/FuncTorrent/Peer.hs
index 490f08014f14344b046173d982fccebbb4d49390..54761211d38eaa98fe1c7ee58bd97465df7a8ac7 100644 (file)
--- a/src/FuncTorrent/Peer.hs
+++ b/src/FuncTorrent/Peer.hs
@@ -28,10 +28,10 @@ type IP = String
 type Port = Integer
 
 data PeerState = PeerState { handle :: Handle
-                           , am_choking :: Bool
-                           , am_interested :: Bool
-                           , peer_choking :: Bool
-                           , peer_interested :: Bool}
+                           , amChoking :: Bool
+                           , amInterested :: Bool
+                           , peerChoking :: Bool
+                           , peerInterested :: Bool}
 
 -- Maintain info on every piece and the current state of it.
 -- should probably be a TVar.
@@ -173,14 +173,14 @@ bitfieldToList :: [Word8] -> [Integer]
 bitfieldToList bs = go bs 0
   where go [] _ = []
         go (b:bs') pos =
-          let setBits = [pos*8 + (toInteger i) | i <- [0..8], testBit b i]
+          let setBits = [pos*8 + toInteger i | i <- [0..8], testBit b i]
           in
-           setBits ++ (go bs' (pos + 1))
+           setBits ++ go bs' (pos + 1)
 
 -- downloadPiece :: Integer -> Handle -> IO ()
 
 createDummyFile :: FilePath -> Int -> IO ()
-createDummyFile path size = do
+createDummyFile path size =
   writeFile path (BC.replicate size '\0')
 
 -- loop1 :: shake hands with all peers, find out the pieces they have, form PieceData.
@@ -196,13 +196,13 @@ msgLoop h pieceHash =
      case msg of
       BitFieldMsg bss -> do
         let pieceList = bitfieldToList (unpack bss)
-        putStrLn (show pieceList)
+        print pieceList
         -- download each of the piece in order
-      _ -> putStrLn (show msg)
+      _ -> print msg
 
 handlePeerMsgs :: Peer -> Metainfo -> String -> (String -> IO ()) -> IO ()
 handlePeerMsgs p m peerId logFn = do
   h <- handShake p (infoHash m) peerId
-  logFn $ "handShake"
+  logFn "handShake"
   msgLoop h (pieces (info m))
   

diff --git a/src/Main.hs b/src/Main.hs
index 8171d385a4ccfefe2f8136e8c0199f82ce50966a..12af02e5aa7a97aa4b00089416e8a9fe2da71a1a 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -41,7 +41,7 @@ main = do
     log "Starting up functorrent"
     log $ "Parsing arguments " ++ concat args
     torrentStr <- parse args
-    case (torrentToMetainfo torrentStr) of
+    case torrentToMetainfo torrentStr of
      Left e -> logError e log
      Right m -> do
        log "Input File OK"