nitpicks

diff --git a/Network/AMQP/Utils/Helpers.hs b/Network/AMQP/Utils/Helpers.hs
index f51309af50b83371fb27d745927e050b0cbe1682..ccb7d54e70b31fb05b42faf5237cbc28c2da3d54 100644 (file)
--- a/Network/AMQP/Utils/Helpers.hs
+++ b/Network/AMQP/Utils/Helpers.hs
@@ -88,9 +88,11 @@ hr x = hPutStrLn stderr hr' >> hFlush stderr
     hr' = take 72 $ (take 25 hr'') ++ " " ++ x ++ " " ++ hr''
     hr'' = repeat '-'
 
+-- | format headers for printing
 formatheaders :: ((T.Text, FieldValue) -> [a]) -> FieldTable -> [a]
 formatheaders f (FieldTable ll) = concat $ map f $ M.toList ll
 
+-- | format headers for setting environment variables
 formatheaders' ::
      ((Int, (T.Text, FieldValue)) -> [(String, String)]) -> FieldTable -> [(String,String)]
 formatheaders' f (FieldTable ll) = concat $ map f $ zip [0 ..] $ M.toList ll
@@ -141,7 +143,8 @@ printopt :: (String, Maybe String) -> [String]
 printopt (_, Nothing) = []
 printopt (opt, Just s) = [opt, s]
 
--- | prints header and head on stderr and returns cmdline options to callback
+-- | prints header and head on stderr and returns
+-- cmdline options and environment variables to callback
 printmsg ::
      Maybe Handle
   -> (Message, Envelope)
@@ -185,7 +188,7 @@ printmsg h (msg, envi) anR now = do
           , ("PRIORITY", pri)
           , ("REDELIVERED", redeliv)
           ] ++
-        concat ( maybeToList headers'' )
+        headersEnv
   return (cmdline, environment)
   where
     step (_, Nothing) xs = xs
@@ -202,10 +205,11 @@ printmsg h (msg, envi) anR now = do
            , ("-p", pri)
            , ("-R", redeliv)
            ] ++
-         maybeToList headers')
+         headersOpt)
     headers = fmap (formatheaders fieldshow) $ msgHeaders msg
-    headers' = fmap (formatheaders fieldshow') $ msgHeaders msg
-    headers'' = fmap (formatheaders' fieldshow'') $ msgHeaders msg
+    headersOpt = maybeToList $ fmap (formatheaders fieldshow') $ msgHeaders msg
+    headersEnv =
+      concat . maybeToList $ fmap (formatheaders' fieldshow'') $ msgHeaders msg
     body = msgBody msg
     anriss =
       if isimage ctype