Skip to content

Commit 0efb4d2

Browse files
Steven Rostedtrostedt
authored andcommitted
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>
1 parent 5dd4de5 commit 0efb4d2

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

lib/vsprintf.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,8 @@ static char *ip4_addr_string(char *buf, char *end, const u8 *addr,
794794
*
795795
* - 'F' For symbolic function descriptor pointers with offset
796796
* - '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
798799
* - 'R' For a struct resource pointer, it prints the range of
799800
* addresses (not the name nor the flags)
800801
* - 'M' For a 6-byte MAC address, it prints the address in the
@@ -1069,6 +1070,7 @@ static int format_decode(const char *fmt, struct printf_spec *spec)
10691070
* %pF output the name of a function pointer with its offset
10701071
* %pf output the name of a function pointer without its offset
10711072
* %pR output the address range in a struct resource
1073+
* %n is ignored
10721074
*
10731075
* The return value is the number of characters which would
10741076
* be generated for the given input, excluding the trailing
@@ -1524,11 +1526,7 @@ EXPORT_SYMBOL_GPL(vbin_printf);
15241526
* a binary buffer that generated by vbin_printf.
15251527
*
15261528
* The format follows C99 vsnprintf, but has some extensions:
1527-
* %pS output the name of a text symbol
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
1529+
* see vsnprintf comment for details.
15321530
*
15331531
* The return value is the number of characters which would
15341532
* be generated for the given input, excluding the trailing

0 commit comments

Comments
 (0)