Browse Source

quench warnings

master
Philipp Balzarek 12 years ago
parent
commit
c6743bd12b
  1. 1
      source/Network/Xmpp/Concurrent.hs
  2. 4
      source/Network/Xmpp/Sasl.hs
  3. 12
      source/Network/Xmpp/Stream.hs
  4. 1
      source/Network/Xmpp/Tls.hs

1
source/Network/Xmpp/Concurrent.hs

@ -138,7 +138,6 @@ handleIQ iqHands out sta as = do
-- IQ was sent to a (full) JID. The answer has to come from -- IQ was sent to a (full) JID. The answer has to come from
-- the same exact JID. -- the same exact JID.
Right j -> iqFrom iq == Just j Right j -> iqFrom iq == Just j
_ -> False
case expected of case expected of
True -> do True -> do
let answer = Just (either IQResponseError let answer = Just (either IQResponseError

4
source/Network/Xmpp/Sasl.hs

@ -102,8 +102,8 @@ xmppBind rsrc c = runErrorT $ do
case answer of case answer of
Right IQResult{iqResultPayload = Just b} -> do Right IQResult{iqResultPayload = Just b} -> do
lift $ debugM "Pontarius.Xmpp" "xmppBind: IQ result received; unpickling JID..." lift $ debugM "Pontarius.Xmpp" "xmppBind: IQ result received; unpickling JID..."
let jid = unpickleElem xpJid' b let j = unpickleElem xpJid' b
case jid of case j of
Right jid' -> do Right jid' -> do
lift $ infoM "Pontarius.Xmpp" $ "Bound JID: " ++ show jid' lift $ infoM "Pontarius.Xmpp" $ "Bound JID: " ++ show jid'
_ <- lift $ withStream ( do modify $ \s -> _ <- lift $ withStream ( do modify $ \s ->

12
source/Network/Xmpp/Stream.hs

@ -111,12 +111,12 @@ startStream = runErrorT $ do
-- state of the stream. -- state of the stream.
let expectedTo = case ( streamConnectionState st let expectedTo = case ( streamConnectionState st
, toJid $ streamConfiguration st) of , toJid $ streamConfiguration st) of
(Plain , (Just (jid, True))) -> Just jid (Plain , (Just (j, True))) -> Just j
(Plain , _ ) -> Nothing (Plain , _ ) -> Nothing
(Secured , (Just (jid, _ ))) -> Just jid (Secured , (Just (j, _ ))) -> Just j
(Secured , Nothing ) -> Nothing (Secured , Nothing ) -> Nothing
(Closed , _ ) -> Nothing (Closed , _ ) -> Nothing
(Finished , _ ) -> Nothing (Finished , _ ) -> Nothing
case streamAddress st of case streamAddress st of
Nothing -> do Nothing -> do
lift $ lift $ errorM "Pontarius.Xmpp" "Server sent no hostname." lift $ lift $ errorM "Pontarius.Xmpp" "Server sent no hostname."

1
source/Network/Xmpp/Tls.hs

@ -19,7 +19,6 @@ import Data.IORef
import Data.XML.Types import Data.XML.Types
import Network.DNS.Resolver (ResolvConf) import Network.DNS.Resolver (ResolvConf)
import Network.TLS import Network.TLS
import Network.TLS.Extra
import Network.Xmpp.Stream import Network.Xmpp.Stream
import Network.Xmpp.Types import Network.Xmpp.Types
import System.Log.Logger (debugM, errorM, infoM) import System.Log.Logger (debugM, errorM, infoM)

Loading…
Cancel
Save