aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-09-17 09:27:29 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-09-17 15:53:46 -0400
commit0efb4d20723d58edbad29d1ff98a86b631adb5e6 (patch)
tree4713e395ed1c8aebff3a865605bec0dab644e7a8 /lib
parent5dd4de587fd9c25cb32a7a0fe9feec3647509b6f (diff)
vsnprintf: remove duplicate comment of vsnprintf
Remove the duplicate comment of bstr_printf that is the same as the vsnprintf. Add the 's' option to the comment for the pointer function. This is more of an internal function so the little duplication of the comment here is OK. Reported-by: Zhaolei <zhaolei@cn.fujitsu.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/vsprintf.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index c8f3ed62cee1..d320c1816a7b 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -794,7 +794,8 @@ static char *ip4_addr_string(char *buf, char *end, const u8 *addr,
794 * 794 *
795 * - 'F' For symbolic function descriptor pointers with offset 795 * - 'F' For symbolic function descriptor pointers with offset
796 * - 'f' For simple symbolic function names without offset 796 * - 'f' For simple symbolic function names without offset
797 * - 'S' For symbolic direct pointers 797 * - 'S' For symbolic direct pointers with offset
798 * - 's' For symbolic direct pointers without offset
798 * - 'R' For a struct resource pointer, it prints the range of 799 * - 'R' For a struct resource pointer, it prints the range of
799 * addresses (not the name nor the flags) 800 * addresses (not the name nor the flags)
800 * - 'M' For a 6-byte MAC address, it prints the address in the 801 * - 'M' For a 6-byte MAC address, it prints the address in the
@@ -1069,6 +1070,7 @@ qualifier:
1069 * %pF output the name of a function pointer with its offset 1070 * %pF output the name of a function pointer with its offset
1070 * %pf output the name of a function pointer without its offset 1071 * %pf output the name of a function pointer without its offset
1071 * %pR output the address range in a struct resource 1072 * %pR output the address range in a struct resource
1073 * %n is ignored
1072 * 1074 *
1073 * The return value is the number of characters which would 1075 * The return value is the number of characters which would
1074 * be generated for the given input, excluding the trailing 1076 * be generated for the given input, excluding the trailing
@@ -1524,11 +1526,7 @@ EXPORT_SYMBOL_GPL(vbin_printf);
1524 * a binary buffer that generated by vbin_printf. 1526 * a binary buffer that generated by vbin_printf.
1525 * 1527 *
1526 * The format follows C99 vsnprintf, but has some extensions: 1528 * The format follows C99 vsnprintf, but has some extensions:
1527 * %pS output the name of a text symbol 1529 * see vsnprintf comment for details.
1528 * %pF output the name of a function pointer with its offset
1529 * %pf output the name of a function pointer without its offset
1530 * %pR output the address range in a struct resource
1531 * %n is ignored
1532 * 1530 *
1533 * The return value is the number of characters which would 1531 * The return value is the number of characters which would
1534 * be generated for the given input, excluding the trailing 1532 * be generated for the given input, excluding the trailing