Rename show_key to show_id.

1 files changed, 4 insertions, 4 deletions

diff --git a/kiki.hs b/kiki.hs
index b5f5191..b3147ff 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -85,7 +85,7 @@ import Data.OpenPGP.Util (verify,fingerprint)
                                 [(a, Int)] -> [a] -> ([[a]], [a])
     readPublicKey :: Char8.ByteString -> RSAPublicKey
     show_all :: KeyDB -> IO ()
-    show_key :: forall t.
+    show_id :: forall t.
                 String -> t -> Map.Map KeyRing.KeyKey KeyData -> IO ()
     show_pem :: String -> String -> KeyDB -> IO ()
     show_ssh :: String -> String -> KeyDB -> IO ()
@@ -300,7 +300,7 @@ show_ssh keyspec wkgrip db = do
         blob = Base64.encode (L.unpack bs)
     putStrLn $ "ssh-rsa " ++ blob
 
-show_key keyspec wkgrip db = do
+show_id keyspec wkgrip db = do
     let s = parseSpec "" keyspec
     let ps = do
             (_,k) <- filterMatches (fst s) (Map.toList db)
@@ -785,7 +785,7 @@ sync bExport bImport bSecret cmdarg args_raw = do
             let shspec = Map.fromList [("--show-wk", const $ show_wk (rtSecring rt) grip)
                                       {-,("--show-all",const show_all)
                                       ,("--show-whose-key", const $ show_whose_key input_key)
-                                      ,("--show-key",\[x] -> show_key x $ fromMaybe "" grip)
+                                      ,("--show-key",\[x] -> show_id x $ fromMaybe "" grip)
                                       ,("--show-pem",\[x] -> show_pem x $ fromMaybe "" grip)
                                       ,("--show-ssh",\[x] -> show_ssh x $ fromMaybe "" grip)
                                       ,("--show-wip",\[x] -> show_wip x $ fromMaybe "" grip)-}
@@ -891,7 +891,7 @@ kiki "show" args = do
             let shspec = Map.fromList [("--working", const $ show_wk (rtSecring rt) grip)
                                       ,("--all",const show_all)
                                       ,("--whose-key", const $ show_whose_key input_key)
-                                      ,("--key",\[x] -> show_key x $ fromMaybe "" grip)
+                                      ,("--key",\[x] -> show_id x $ fromMaybe "" grip)
                                       ,("--pem",\[x] -> show_pem x $ fromMaybe "" grip)
                                       ,("--ssh",\[x] -> show_ssh x $ fromMaybe "" grip)
                                       ,("--wip",\[x] -> show_wip x $ fromMaybe "" grip)