[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 62b4848e8dbf21fac0e39cc7ef0736e20a235e82
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Dec 27 04:17:14 2005 +0100

    Converted MissingH.Network.FTP.Server from MissingH.Printf to Text.Printf

diff --git a/MissingH/Network/FTP/Server.hs b/MissingH/Network/FTP/Server.hs
index 07ca404..c576ce6 100644
--- a/MissingH/Network/FTP/Server.hs
+++ b/MissingH/Network/FTP/Server.hs
@@ -90,13 +90,12 @@ import MissingH.Logging.Logger
 import MissingH.Network
 import MissingH.Network.SocketServer
 import MissingH.Str
-import MissingH.Printf
 import MissingH.IO.HVIO
 import MissingH.IO.HVFS
 import MissingH.IO.HVFS.InstanceHelpers
 import MissingH.IO.HVFS.Utils
+import Text.Printf
 import Data.Char
-import MissingH.Printf
 import Data.IORef
 import Data.List
 import Control.Exception(finally)
@@ -131,7 +130,7 @@ ftpPutStrLn (FTPServer h _ _) text =
 {- | Send a reply code, handling multi-line text as necessary. -}
 sendReply :: FTPServer -> Int -> String -> IO ()
 sendReply h codei text =
-    let codes = vsprintf "%03d" codei
+    let codes = printf "%03d" codei
         writethis [] = ftpPutStrLn h (codes ++ "  ")
         writethis [item] = ftpPutStrLn h (codes ++ " " ++ item)
         writethis (item:xs) = do ftpPutStrLn h (codes ++ "-" ++ item)
@@ -627,7 +626,7 @@ cmd_help h@(FTPServer _ _ state) args =
           ,""
           ,""
           ,"I know of the following commands:"
-          ,concatMap (\ (name, (_, (summary, _))) -> vsprintf "%-10s %s\n" name summary)
+          ,concatMap (\ (name, (_, (summary, _))) -> printf "%-10s %s\n" name summary)
               (sort commands)
           ,""
           ,"You may type \"HELP command\" for more help on a specific command."

-- 
haskell-testpack