From 7cbbd3e0e68aa9a259239957c2227839f66b36a3 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Sat, 20 Sep 2008 22:22:12 -0700
Subject: [PATCH] Some fixes to printf for help-lint warnings.

---
 extra/printf/printf-docs.factor  | 8 ++++----
 extra/printf/printf-tests.factor | 2 ++
 extra/printf/printf.factor       | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/extra/printf/printf-docs.factor b/extra/printf/printf-docs.factor
index 5025fa421f..fabf6d1ddd 100755
--- a/extra/printf/printf-docs.factor
+++ b/extra/printf/printf-docs.factor
@@ -6,7 +6,7 @@ IN: printf
 HELP: printf
 { $values { "format-string" string } }
 { $description 
-    "Writes the arguments formatted according to the format string.\n" 
+    "Writes the arguments (specified on the stack) formatted according to the format string.\n" 
     { $table
         { "%%"    "Single %" "" }
         { "%P.Ds" "String format" "string" }
@@ -45,7 +45,7 @@ HELP: printf
         "00123" }
     { $example
         "USING: printf ;"
-        "HEX: ff \"04X\" printf"
+        "HEX: ff \"%04X\" printf"
         "00FF" }
     { $example
         "USING: printf ;"
@@ -66,7 +66,7 @@ HELP: printf
 } ;
 
 HELP: sprintf
-{ $values { "params" sequence } { "format-string" string } { "result" string } }
-{ $description "Returns the arguments formatted according to the format string as a result string." } 
+{ $values { "format-string" string } { "result" string } }
+{ $description "Returns the arguments (specified on the stack) formatted according to the format string as a result string." } 
 { $see-also printf } ;
 
diff --git a/extra/printf/printf-tests.factor b/extra/printf/printf-tests.factor
index 084553c54d..b365343bf0 100644
--- a/extra/printf/printf-tests.factor
+++ b/extra/printf/printf-tests.factor
@@ -5,6 +5,8 @@ USING: kernel printf tools.test ;
 
 [ "%s" printf ] must-infer 
 
+[ "%s" sprintf ] must-infer
+
 [ t ] [ "10" 10 "%d" sprintf = ] unit-test
 
 [ t ] [ "+10" 10 "%+d" sprintf = ] unit-test
diff --git a/extra/printf/printf.factor b/extra/printf/printf.factor
index 2f23085644..c7a7153d6a 100644
--- a/extra/printf/printf.factor
+++ b/extra/printf/printf.factor
@@ -98,7 +98,7 @@ PRIVATE>
 MACRO: printf ( format-string -- )
     parse-format-string [ length ] keep compose-all '[ _ <vector> @ reverse [ write ] each ] ;
 
-: sprintf ( format-string -- )
-    [ printf ] with-string-writer ;
+: sprintf ( format-string -- result )
+    [ printf ] with-string-writer ; inline