removed many -Wall warnings

4 files changed, 25 insertions, 30 deletions

diff --git a/lib/Numeric/GSL/Differentiation.hs b/lib/Numeric/GSL/Differentiation.hs
index 09236bd..071704a 100644
--- a/lib/Numeric/GSL/Differentiation.hs
+++ b/lib/Numeric/GSL/Differentiation.hs
@@ -34,7 +34,7 @@ derivGen ::
 derivGen c h f x = unsafePerformIO $ do
     r <- malloc
     e <- malloc
-    fp <- mkfun (\x _ -> f x) 
+    fp <- mkfun (\y _ -> f y) 
     c_deriv c fp x h r e // check "deriv"
     vr <- peek r
     ve <- peek e
diff --git a/lib/Numeric/GSL/Matrix.hs b/lib/Numeric/GSL/Matrix.hs
index 07d4660..d51728e 100644
--- a/lib/Numeric/GSL/Matrix.hs
+++ b/lib/Numeric/GSL/Matrix.hs
@@ -17,13 +17,13 @@ module Numeric.GSL.Matrix(
     eigSg, eigHg,
     svdg,
     qr, qrPacked, unpackQR,
-    cholR, -- cholC,
+    cholR, cholC,
     luSolveR, luSolveC,
     luR, luC
 ) where
 
 import Data.Packed.Internal
-import Data.Packed.Matrix(fromLists,ident,takeDiag)
+import Data.Packed.Matrix(ident)
 import Numeric.GSL.Vector
 import Foreign
 import Complex
@@ -44,7 +44,7 @@ import Complex
 
 -}
 eigSg :: Matrix Double -> (Vector Double, Matrix Double)
-eigSg = eigSg . cmat
+eigSg = eigSg' . cmat
 
 eigSg' m
     | r == 1 = (fromList [cdat m `at` 0], singleton 1)
@@ -159,24 +159,24 @@ qrPacked :: Matrix Double -> (Matrix Double, Vector Double)
 qrPacked = qrPacked' . cmat
 
 qrPacked' x = unsafePerformIO $ do
-    qr <- createMatrix RowMajor r c
+    qrp <- createMatrix RowMajor r c
     tau <- createVector (min r c)
-    app3 c_qrPacked mat x mat qr vec tau "qrUnpacked"
-    return (qr,tau)
+    app3 c_qrPacked mat x mat qrp vec tau "qrUnpacked"
+    return (qrp,tau)
   where r = rows x
         c = cols x
 foreign import ccall "gsl-aux.h QRpacked" c_qrPacked :: TMMV
 
 unpackQR :: (Matrix Double, Vector Double) -> (Matrix Double, Matrix Double)
-unpackQR (qr,tau) = unpackQR' (cmat qr, tau)
+unpackQR (qrp,tau) = unpackQR' (cmat qrp, tau)
 
-unpackQR' (qr,tau) = unsafePerformIO $ do
+unpackQR' (qrp,tau) = unsafePerformIO $ do
     q <- createMatrix RowMajor r r
     res <- createMatrix RowMajor r c
-    app4 c_qrUnpack mat qr vec tau mat q mat res "qrUnpack"
+    app4 c_qrUnpack mat qrp vec tau mat q mat res "qrUnpack"
     return (q,res)
-  where r = rows qr
-        c = cols qr
+  where r = rows qrp
+        c = cols qrp
 foreign import ccall "gsl-aux.h QRunpack" c_qrUnpack :: TMVMM
 
 
@@ -259,7 +259,6 @@ luRaux' x = unsafePerformIO $ do
     app2 c_luRaux mat x vec res "luRaux"
     return res
   where r = rows x
-        c = cols x
 foreign import ccall "gsl-aux.h luRaux" c_luRaux :: TMV
 
 {- | lu decomposition of complex matrix (packed as a vector including l, u, the permutation and sign)
@@ -272,7 +271,6 @@ luCaux' x = unsafePerformIO $ do
     app2 c_luCaux mat x vec res "luCaux"
     return res
   where r = rows x
-        c = cols x
 foreign import ccall "gsl-aux.h luCaux" c_luCaux :: TCMCV
 
 {- | The LU decomposition of a square matrix. Is based on /gsl_linalg_LU_decomp/ and  /gsl_linalg_complex_LU_decomp/ as described in <http://www.gnu.org/software/Numeric.GSL/manual/Numeric.GSL-ref_13.html#SEC223>.
diff --git a/lib/Numeric/GSL/Minimization.hs b/lib/Numeric/GSL/Minimization.hs
index 235a88f..98c0ca9 100644
--- a/lib/Numeric/GSL/Minimization.hs
+++ b/lib/Numeric/GSL/Minimization.hs
@@ -24,7 +24,6 @@ module Numeric.GSL.Minimization (
 import Data.Packed.Internal
 import Data.Packed.Matrix
 import Foreign
-import Complex
 
 -------------------------------------------------------------------------
 
@@ -84,9 +83,9 @@ minimizeNMSimplex f xi sz tol maxit = unsafePerformIO $ do
         szv = fromList sz
         n   = dim xiv
     fp <- mkVecfun (iv (f.toList))
-    rawpath <- ww2 withVector xiv withVector szv $ \xiv szv ->
+    rawpath <- ww2 withVector xiv withVector szv $ \xiv' szv' ->
                    createMIO maxit (n+3)
-                         (c_minimizeNMSimplex fp tol maxit // xiv // szv)
+                         (c_minimizeNMSimplex fp tol maxit // xiv' // szv')
                          "minimizeNMSimplex"
     let it = round (rawpath @@> (maxit-1,0))
         path = takeRows it rawpath
@@ -150,9 +149,9 @@ minimizeConjugateGradient istep minimpar tol maxit f df xi = unsafePerformIO $ d
         df' = (fromList . df . toList)
     fp <- mkVecfun (iv f')
     dfp <- mkVecVecfun (aux_vTov df')
-    rawpath <- withVector xiv $ \xiv ->
+    rawpath <- withVector xiv $ \xiv' ->
                     createMIO maxit (n+2)
-                         (c_minimizeConjugateGradient fp dfp istep minimpar tol maxit // xiv)
+                         (c_minimizeConjugateGradient fp dfp istep minimpar tol maxit // xiv')
                          "minimizeDerivV"
     let it = round (rawpath @@> (maxit-1,0))
         path = takeRows it rawpath
@@ -171,8 +170,8 @@ foreign import ccall "gsl-aux.h minimizeWithDeriv"
 ---------------------------------------------------------------------
 iv :: (Vector Double -> Double) -> (Int -> Ptr Double -> Double)
 iv f n p = f (createV n copy "iv") where
-    copy n q = do 
-        copyArray q p n
+    copy n' q = do
+        copyArray q p n'
         return 0
 
 -- | conversion of Haskell functions into function pointers that can be used in the C side
@@ -187,12 +186,12 @@ foreign import ccall "wrapper"
 
 aux_vTov :: (Vector Double -> Vector Double) -> (Int -> Ptr Double -> Ptr Double -> IO())
 aux_vTov f n p r = g where
-    v@V {fptr = pr} = f x
+    V {fptr = pr} = f x
     x = createV n copy "aux_vTov"
-    copy n q = do
-        copyArray q p n
+    copy n' q = do
+        copyArray q p n'
         return 0
-    g = withForeignPtr pr $ \p -> copyArray r p n
+    g = withForeignPtr pr $ \p' -> copyArray r p' n
 
 --------------------------------------------------------------------
 
@@ -202,6 +201,6 @@ createV n fun msg = unsafePerformIO $ do
     return r
 
 createMIO r c fun msg = do
-    r <- createMatrix RowMajor r c
-    app1 fun mat r msg
-    return r
+    res <- createMatrix RowMajor r c
+    app1 fun mat res msg
+    return res
diff --git a/lib/Numeric/GSL/Special.hs b/lib/Numeric/GSL/Special.hs
index b6cea2b..3fd2ac2 100644
--- a/lib/Numeric/GSL/Special.hs
+++ b/lib/Numeric/GSL/Special.hs
@@ -44,8 +44,6 @@ module Numeric.GSL.Special (
 )
 where
 
-import Foreign
-import Numeric.GSL.Special.Internal
 import Numeric.GSL.Special.Airy
 import Numeric.GSL.Special.Bessel
 import Numeric.GSL.Special.Clausen