Cleanup an old function

Also replace a type with its synonim.

diff --git a/Ganeti/HTools/Cluster.hs b/Ganeti/HTools/Cluster.hs
index a3d27c2..adb6634 100644 (file)
--- a/Ganeti/HTools/Cluster.hs
+++ b/Ganeti/HTools/Cluster.hs
@@ -117,7 +117,7 @@ computeBadItems nl il =
     (bad_nodes, bad_instances)
 
 -- | Compute the total free disk and memory in the cluster.
     (bad_nodes, bad_instances)
 
 -- | Compute the total free disk and memory in the cluster.

-totalResources :: Container.Container Node.Node -> (Int, Int)
+totalResources :: Node.List -> (Int, Int)

 totalResources nl =
     foldl'
     (\ (mem, dsk) node -> (mem + (Node.f_mem node),
 totalResources nl =
     foldl'
     (\ (mem, dsk) node -> (mem + (Node.f_mem node),

diff --git a/Ganeti/HTools/Utils.hs b/Ganeti/HTools/Utils.hs
index 459dc92..16e3768 100644 (file)
--- a/Ganeti/HTools/Utils.hs
+++ b/Ganeti/HTools/Utils.hs
@@ -5,7 +5,6 @@ module Ganeti.HTools.Utils
       debug
     , sepSplit
     , varianceCoeff
       debug
     , sepSplit
     , varianceCoeff

-    , readData

     , commaJoin
     , readEitherString
     , loadJSArray
     , commaJoin
     , readEitherString
     , loadJSArray

@@ -73,15 +72,6 @@ stdDev lst =
 varianceCoeff :: Floating a => [a] -> a
 varianceCoeff lst = (stdDev lst) / (fromIntegral $ length lst)
 
 varianceCoeff :: Floating a => [a] -> a
 varianceCoeff lst = (stdDev lst) / (fromIntegral $ length lst)
 

--- | Get an Ok result or print the error and exit.
-readData :: Result a -> IO a
-readData nd =
-    (case nd of
-       Bad x -> do
-         putStrLn x
-         exitWith $ ExitFailure 1
-       Ok x -> return x)
-

 -- * JSON-related functions
 
 -- | Converts a JSON Result into a monadic value.
 -- * JSON-related functions
 
 -- | Converts a JSON Result into a monadic value.