Addressed warnings in KeyRing.hs

1 files changed, 14 insertions, 10 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 294933f..0944bd2 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -133,7 +133,6 @@ import Foreign.Storable
 #endif
 import System.FilePath ( takeDirectory )
 import System.IO (hPutStrLn,withFile,IOMode(..), Handle, hPutStr)
-import Foreign.C.Types ( CTime )
 import Data.IORef
 import System.Posix.IO ( fdToHandle )
 import qualified Data.Traversable as Traversable ( mapM )
@@ -550,10 +549,12 @@ instance Applicative KikiCondition where
 
 -- | This type is used to describe events triggered by 'runKeyRing'.  In
 -- addition to normal feedback (e.g. 'NewPacket'), it also may indicate
--- non-fatal IO exceptions (e.g. FailedExternal).  Because a 'KeyRingOperation'
--- may describe a very intricate multifaceted algorithm with many inputs and
--- outputs, an operation may be partially (or even mostly) successful even when
--- some aspect failed.
+-- non-fatal IO exceptions (e.g. 'FailedExternal').  Because a
+-- 'KeyRingOperation' may describe a very intricate multifaceted algorithm with
+-- many inputs and outputs, an operation may be partially (or even mostly)
+-- successful even when I/O failures occured.  In this situation, the files may
+-- not have all the information they were intended to store, but they will be
+-- in a valid format for GnuPG or kiki to operate on in the future.
 data KikiReportAction =
         NewPacket String
         | MissingPacket String
@@ -1031,8 +1032,11 @@ writeStamped0 ctx inp stamp dowrite bs = do
     dowrite (Right fname) bs
     setFileTimes fname stamp stamp
 
+{- This may be useful later.  Commented for now, as it is not used.
+ -
 writeStampedL :: InputFileContext -> InputFile -> Posix.EpochTime -> L.ByteString -> IO ()
 writeStampedL ctx f stamp bs = writeStamped0 ctx f stamp (either L.hPut L.writeFile) bs
+-}
 
 writeStamped :: InputFileContext -> InputFile -> Posix.EpochTime -> String -> IO ()
 writeStamped ctx f stamp str = writeStamped0 ctx f stamp (either hPutStr writeFile) str
@@ -1052,11 +1056,15 @@ getInputFileTime ctx (resolveInputFile ctx -> [fname]) = do
     handleIO_ (error $ fname++": modificaiton time?") $
                     modificationTime <$> getFileStatus fname
 
+{-
+ - This may be useful later.  Commented for now as it is not used.
+ -
 doesInputFileExist :: InputFileContext -> InputFile -> IO Bool
 doesInputFileExist ctx f = do
     case resolveInputFile ctx f of
         [n] -> doesFileExist n
         _   -> return True
+-}
 
 
 cachedContents :: InputFileContext -> InputFile -> IO (IO S.ByteString)
@@ -1205,7 +1213,7 @@ buildKeyDB ctx grip0 keyring = do
             guard (isring $ typ stream)
             resolveInputFile ctx f
 
-        (ringMap,nonRingMap) = Map.partition (isring . typ) $ opFiles keyring
+        ringMap = Map.filter (isring . typ) $ opFiles keyring
 
         readp f stream = fmap readp0 $ readPacketsFromFile ctx f
          where
@@ -1568,10 +1576,6 @@ importPublic = Just True
 importSecret :: Maybe Bool
 importSecret = Just False
 
--- | returns Nothing to indicate that no new master
--- keys will be imported.
-subkeysOnly :: Maybe Bool
-subkeysOnly  = Nothing
 
 -- TODO: Do we need to memoize this?
 guardAuthentic :: KeyRingRuntime -> KeyData -> Maybe ()