From ffc18bb29db5d9392c1c84a967d994fbd7e2a339 Mon Sep 17 00:00:00 2001 From: Thomas Thrainer Date: Wed, 17 Apr 2013 15:21:32 +0200 Subject: [PATCH] Fix warnings hlint 1.8.43 complained about These lines are ok according to previous versions of hlint but trigger an error with version 1.8.43. Signed-off-by: Thomas Thrainer Reviewed-by: Helga Velroyen --- src/Ganeti/Curl/Multi.hs | 2 +- src/Ganeti/HTools/Program/Hscan.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Ganeti/Curl/Multi.hs b/src/Ganeti/Curl/Multi.hs index 6f08a00..d096502 100644 --- a/src/Ganeti/Curl/Multi.hs +++ b/src/Ganeti/Curl/Multi.hs @@ -191,7 +191,7 @@ makeEasyHandle (f, e, (opts, url)) = do execMultiCall :: [([CurlOption], String)] -> IO [(CurlCode, String)] execMultiCall ous = do -- error buffers - errorbufs <- mapM (\_ -> mallocErrorBuffer) ous + errorbufs <- mapM (const mallocErrorBuffer) ous -- result buffers outbufs <- mapM (\_ -> newIORef []) ous -- handles diff --git a/src/Ganeti/HTools/Program/Hscan.hs b/src/Ganeti/HTools/Program/Hscan.hs index 38829cd..ddc811a 100644 --- a/src/Ganeti/HTools/Program/Hscan.hs +++ b/src/Ganeti/HTools/Program/Hscan.hs @@ -159,4 +159,4 @@ main opts clusters = do results <- mapM (\name -> Rapi.loadData name >>= writeData nlen name opts) clusters - unless (all id results) $ exitWith (ExitFailure 2) + unless (and results) $ exitWith (ExitFailure 2) -- 1.7.10.4