Skip to content
Snippets Groups Projects
Commit e968172c authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel :man_dancing:
Browse files

Make `-Wall` clean and drop `-fno-warn-unused-imports`


CPP conditional code sections have been carefully taken into account
while performing this warning cleanup. Most `OPTIONS_GHC` declarations
could be dropped (now only a lonely `{-# OPTIONS_GHC -fno-cse #-}`
remains in `Posix.Signals`).

Signed-off-by: Herbert Valerio Riedel's avatarHerbert Valerio Riedel <hvr@gnu.org>
parent 7b9044ab
No related branches found
No related tags found
No related merge requests found
{-# LANGUAGE NondecreasingIndentation #-} {-# LANGUAGE NondecreasingIndentation #-}
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
......
{-# LANGUAGE NondecreasingIndentation #-} {-# LANGUAGE NondecreasingIndentation #-}
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
......
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
...@@ -32,8 +31,6 @@ module System.Posix.Directory.Common ( ...@@ -32,8 +31,6 @@ module System.Posix.Directory.Common (
changeWorkingDirectoryFd, changeWorkingDirectoryFd,
) where ) where
import System.IO.Error
import System.Posix.Error
import System.Posix.Types import System.Posix.Types
import Foreign import Foreign
import Foreign.C import Foreign.C
......
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
...@@ -95,12 +94,9 @@ module System.Posix.Files ( ...@@ -95,12 +94,9 @@ module System.Posix.Files (
import Foreign import Foreign
import Foreign.C import Foreign.C
import System.Posix.Error
import System.Posix.Types import System.Posix.Types
import System.Posix.Internals
import System.Posix.Files.Common import System.Posix.Files.Common
import System.Posix.Internals
import System.Posix.Internals (withFilePath, peekFilePath)
import Data.Time.Clock.POSIX import Data.Time.Clock.POSIX
......
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
...@@ -81,17 +80,22 @@ module System.Posix.Files.Common ( ...@@ -81,17 +80,22 @@ module System.Posix.Files.Common (
#endif #endif
) where ) where
import System.Posix.Error
import System.Posix.Types import System.Posix.Types
import System.IO.Unsafe import System.IO.Unsafe
import Data.Bits import Data.Bits
#if defined(HAVE_STRUCT_STAT_ST_CTIM) || \
defined(HAVE_STRUCT_STAT_ST_MTIM) || \
defined(HAVE_STRUCT_STAT_ST_ATIM)
import Data.Int import Data.Int
import Data.Time.Clock.POSIX
import Data.Ratio import Data.Ratio
#endif
import Data.Time.Clock.POSIX
import System.Posix.Internals import System.Posix.Internals
import Foreign.C import Foreign.C
import Foreign.ForeignPtr import Foreign.ForeignPtr
import Foreign.Marshal #if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMENS)
import Foreign.Marshal (withArray)
#endif
import Foreign.Ptr import Foreign.Ptr
import Foreign.Storable import Foreign.Storable
......
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
......
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
...@@ -68,17 +67,9 @@ module System.Posix.IO.ByteString ( ...@@ -68,17 +67,9 @@ module System.Posix.IO.ByteString (
import System.Posix.Types import System.Posix.Types
import System.Posix.IO.Common import System.Posix.IO.Common
import Foreign.C hiding (
throwErrnoPath,
throwErrnoPathIf,
throwErrnoPathIf_,
throwErrnoPathIfNull,
throwErrnoPathIfMinus1,
throwErrnoPathIfMinus1_ )
import System.Posix.ByteString.FilePath import System.Posix.ByteString.FilePath
-- |Open and optionally create this file. See 'System.Posix.Files' -- |Open and optionally create this file. See 'System.Posix.Files'
-- for information on how to use the 'FileMode' type. -- for information on how to use the 'FileMode' type.
openFd :: RawFilePath openFd :: RawFilePath
......
{-# LANGUAGE NondecreasingIndentation, RecordWildCards #-} {-# LANGUAGE NondecreasingIndentation, RecordWildCards #-}
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
...@@ -63,15 +62,12 @@ module System.Posix.IO.Common ( ...@@ -63,15 +62,12 @@ module System.Posix.IO.Common (
import System.IO import System.IO
import System.IO.Error import System.IO.Error
import System.Posix.Types import System.Posix.Types
import System.Posix.Error
import qualified System.Posix.Internals as Base import qualified System.Posix.Internals as Base
import Foreign import Foreign
import Foreign.C import Foreign.C
import Data.Bits
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
import GHC.IO.Handle
import GHC.IO.Handle.Internals import GHC.IO.Handle.Internals
import GHC.IO.Handle.Types import GHC.IO.Handle.Types
import qualified GHC.IO.FD as FD import qualified GHC.IO.FD as FD
......
{-# OPTIONS_GHC -w #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
-- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
-- for details
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- | -- |
-- Module : System.Posix.Resource -- Module : System.Posix.Resource
...@@ -70,7 +64,7 @@ foreign import ccall unsafe "HsUnix.h __hscore_setrlimit" ...@@ -70,7 +64,7 @@ foreign import ccall unsafe "HsUnix.h __hscore_setrlimit"
getResourceLimit :: Resource -> IO ResourceLimits getResourceLimit :: Resource -> IO ResourceLimits
getResourceLimit res = do getResourceLimit res = do
allocaBytes (#const sizeof(struct rlimit)) $ \p_rlimit -> do allocaBytes (#const sizeof(struct rlimit)) $ \p_rlimit -> do
throwErrnoIfMinus1 "getResourceLimit" $ throwErrnoIfMinus1_ "getResourceLimit" $
c_getrlimit (packResource res) p_rlimit c_getrlimit (packResource res) p_rlimit
soft <- (#peek struct rlimit, rlim_cur) p_rlimit soft <- (#peek struct rlimit, rlim_cur) p_rlimit
hard <- (#peek struct rlimit, rlim_max) p_rlimit hard <- (#peek struct rlimit, rlim_max) p_rlimit
...@@ -84,7 +78,7 @@ setResourceLimit res ResourceLimits{softLimit=soft,hardLimit=hard} = do ...@@ -84,7 +78,7 @@ setResourceLimit res ResourceLimits{softLimit=soft,hardLimit=hard} = do
allocaBytes (#const sizeof(struct rlimit)) $ \p_rlimit -> do allocaBytes (#const sizeof(struct rlimit)) $ \p_rlimit -> do
(#poke struct rlimit, rlim_cur) p_rlimit (packRLimit soft True) (#poke struct rlimit, rlim_cur) p_rlimit (packRLimit soft True)
(#poke struct rlimit, rlim_max) p_rlimit (packRLimit hard False) (#poke struct rlimit, rlim_max) p_rlimit (packRLimit hard False)
throwErrnoIfMinus1 "setResourceLimit" $ throwErrnoIfMinus1_ "setResourceLimit" $
c_setrlimit (packResource res) p_rlimit c_setrlimit (packResource res) p_rlimit
return () return ()
...@@ -101,16 +95,20 @@ packResource ResourceTotalMemory = (#const RLIMIT_AS) ...@@ -101,16 +95,20 @@ packResource ResourceTotalMemory = (#const RLIMIT_AS)
unpackRLimit :: CRLim -> ResourceLimit unpackRLimit :: CRLim -> ResourceLimit
unpackRLimit (#const RLIM_INFINITY) = ResourceLimitInfinity unpackRLimit (#const RLIM_INFINITY) = ResourceLimitInfinity
#ifdef RLIM_SAVED_MAX #if defined(RLIM_SAVED_MAX) && (RLIM_SAVED_MAX != RLIM_INFINITY)
unpackRLimit (#const RLIM_SAVED_MAX) = ResourceLimitUnknown unpackRLimit (#const RLIM_SAVED_MAX) = ResourceLimitUnknown
#endif
#if defined(RLIM_SAVED_CUR) && (RLIM_SAVED_CUR != RLIM_INFINITY)
unpackRLimit (#const RLIM_SAVED_CUR) = ResourceLimitUnknown unpackRLimit (#const RLIM_SAVED_CUR) = ResourceLimitUnknown
#endif #endif
unpackRLimit other = ResourceLimit (fromIntegral other) unpackRLimit other = ResourceLimit (fromIntegral other)
packRLimit :: ResourceLimit -> Bool -> CRLim packRLimit :: ResourceLimit -> Bool -> CRLim
packRLimit ResourceLimitInfinity _ = (#const RLIM_INFINITY) packRLimit ResourceLimitInfinity _ = (#const RLIM_INFINITY)
#ifdef RLIM_SAVED_MAX #ifdef RLIM_SAVED_CUR
packRLimit ResourceLimitUnknown True = (#const RLIM_SAVED_CUR) packRLimit ResourceLimitUnknown True = (#const RLIM_SAVED_CUR)
#endif
#ifdef RLIM_SAVED_MAX
packRLimit ResourceLimitUnknown False = (#const RLIM_SAVED_MAX) packRLimit ResourceLimitUnknown False = (#const RLIM_SAVED_MAX)
#endif #endif
packRLimit (ResourceLimit other) _ = fromIntegral other packRLimit (ResourceLimit other) _ = fromIntegral other
......
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
...@@ -27,9 +26,12 @@ module System.Posix.SharedMem ...@@ -27,9 +26,12 @@ module System.Posix.SharedMem
#include "HsUnix.h" #include "HsUnix.h"
import System.Posix.Types import System.Posix.Types
import System.Posix.Error #if defined(HAVE_SHM_OPEN) || defined(HAVE_SHM_UNLINK)
import Foreign.C import Foreign.C
#endif
#ifdef HAVE_SHM_OPEN
import Data.Bits import Data.Bits
#endif
data ShmOpenFlags = ShmOpenFlags data ShmOpenFlags = ShmOpenFlags
{ shmReadWrite :: Bool, { shmReadWrite :: Bool,
......
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
...@@ -76,9 +75,11 @@ import Foreign ...@@ -76,9 +75,11 @@ import Foreign
import Foreign.C import Foreign.C
import System.Posix.Terminal.Common import System.Posix.Terminal.Common
import System.Posix.Types import System.Posix.Types
#ifndef HAVE_OPENPTY
import System.Posix.IO import System.Posix.IO
#endif
import System.Posix.Internals (withFilePath, peekFilePath) import System.Posix.Internals (peekFilePath)
-- | @getTerminalName fd@ calls @ttyname@ to obtain a name associated -- | @getTerminalName fd@ calls @ttyname@ to obtain a name associated
-- with the terminal for @Fd@ @fd@. If @fd@ is associated -- with the terminal for @Fd@ @fd@. If @fd@ is associated
......
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
...@@ -75,8 +74,10 @@ module System.Posix.Terminal.ByteString ( ...@@ -75,8 +74,10 @@ module System.Posix.Terminal.ByteString (
import Foreign import Foreign
import System.Posix.Types import System.Posix.Types
import System.Posix.Terminal.Common import System.Posix.Terminal.Common
import System.Posix.IO.ByteString #ifndef HAVE_OPENPTY
import Data.ByteString.Char8 as B import System.Posix.IO.ByteString (defaultFileFlags, openFd, noctty, OpenMode(ReadWrite))
import Data.ByteString.Char8 as B ( pack, )
#endif
import Foreign.C hiding ( import Foreign.C hiding (
throwErrnoPath, throwErrnoPath,
...@@ -185,9 +186,9 @@ foreign import ccall unsafe "__hsunix_unlockpt" ...@@ -185,9 +186,9 @@ foreign import ccall unsafe "__hsunix_unlockpt"
c_unlockpt :: CInt -> IO CInt c_unlockpt :: CInt -> IO CInt
#else #else
c_grantpt :: CInt -> IO CInt c_grantpt :: CInt -> IO CInt
c_grantpt _ = return (fromIntegral 0) c_grantpt _ = return (fromIntegral (0::Int))
c_unlockpt :: CInt -> IO CInt c_unlockpt :: CInt -> IO CInt
c_unlockpt _ = return (fromIntegral 0) c_unlockpt _ = return (fromIntegral (0::Int))
#endif /* HAVE_PTSNAME */ #endif /* HAVE_PTSNAME */
#endif /* !HAVE_OPENPTY */ #endif /* !HAVE_OPENPTY */
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
...@@ -69,22 +68,13 @@ module System.Posix.Terminal.Common ( ...@@ -69,22 +68,13 @@ module System.Posix.Terminal.Common (
import Data.Bits import Data.Bits
import Data.Char import Data.Char
import Foreign.C.Error ( errnoToIOError, throwErrnoIfMinus1, import Foreign.C.Error ( throwErrnoIfMinus1, throwErrnoIfMinus1_ )
throwErrnoIfMinus1_, throwErrnoIfNull )
#ifndef HAVE_PTSNAME
import Foreign.C.Error ( eNOSYS )
#endif
import Foreign.C.String ( CString, peekCString, withCString )
import Foreign.C.Types import Foreign.C.Types
import Foreign.ForeignPtr ( ForeignPtr, withForeignPtr, mallocForeignPtrBytes ) import Foreign.ForeignPtr ( ForeignPtr, withForeignPtr, mallocForeignPtrBytes )
import Foreign.Marshal.Alloc ( alloca )
import Foreign.Marshal.Utils ( copyBytes ) import Foreign.Marshal.Utils ( copyBytes )
import Foreign.Ptr ( Ptr, nullPtr, plusPtr ) import Foreign.Ptr ( Ptr, plusPtr )
import Foreign.Storable ( Storable(..) ) import Foreign.Storable ( Storable(..) )
import System.IO.Error ( ioError )
import System.IO.Unsafe ( unsafePerformIO ) import System.IO.Unsafe ( unsafePerformIO )
import System.Posix.IO ( OpenFileFlags(..), OpenMode(..), defaultFileFlags,
openFd )
import System.Posix.Types import System.Posix.Types
-- ----------------------------------------------------------------------------- -- -----------------------------------------------------------------------------
......
{-# LANGUAGE NondecreasingIndentation #-} {-# LANGUAGE NondecreasingIndentation #-}
{-# OPTIONS_GHC -fno-warn-unused-imports -fno-warn-unused-binds #-}
#ifdef __GLASGOW_HASKELL__ #ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-} {-# LANGUAGE Trustworthy #-}
#endif #endif
...@@ -56,7 +55,6 @@ import Foreign.C.Error ...@@ -56,7 +55,6 @@ import Foreign.C.Error
import Foreign.C.String ( peekCString ) import Foreign.C.String ( peekCString )
import Foreign.C.Types import Foreign.C.Types
import Foreign import Foreign
import System.Posix.Types
import System.Posix.Internals import System.Posix.Internals
-- ----------------------------------------------------------------------------- -- -----------------------------------------------------------------------------
......
...@@ -117,6 +117,8 @@ library ...@@ -117,6 +117,8 @@ library
System.Posix.Process.Common System.Posix.Process.Common
System.Posix.Terminal.Common System.Posix.Terminal.Common
ghc-options: -Wall
include-dirs: include include-dirs: include
includes: HsUnix.h execvpe.h includes: HsUnix.h execvpe.h
install-includes: install-includes:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment