Skip to content

Commit

Permalink
lib/vsprintf.c: update documentation
Browse files Browse the repository at this point in the history
%n is no longer just ignored; it results in early return from vsnprintf.
Also add a request to add test cases for future %p extensions.

Signed-off-by: Rasmus Villemoes <[email protected]>
Reviewed-by: Martin Kletzander <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Villemoes authored and torvalds committed Nov 7, 2015
1 parent 317dc34 commit d7ec9a0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
12 changes: 6 additions & 6 deletions Documentation/printk-formats.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ Example:

Reminder: sizeof() result is of type size_t.

The kernel's printf does not support %n. For obvious reasons, floating
point formats (%e, %f, %g, %a) are also not recognized. Use of any
unsupported specifier or length qualifier results in a WARN and early
return from vsnprintf.

Raw pointer value SHOULD be printed with %p. The kernel supports
the following extended format specifiers for pointer types:
Expand Down Expand Up @@ -305,13 +309,9 @@ Command from struct task_struct

Passed by reference.

Ignored argument:
If you add other %p extensions, please extend lib/test_printf.c with
one or more test cases, if at all feasible.

%n %n

The argument passed will be ignored. In other words, literal "%n" will
be in the output and the argument will be considered for next format
specifier.

Thank you for your cooperation and attention.

Expand Down
7 changes: 4 additions & 3 deletions lib/vsprintf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,6 @@ int kptr_restrict __read_mostly;
* - 'Cn' For a clock, it prints the name (Common Clock Framework) or address
* (legacy clock framework) of the clock
* - 'Cr' For a clock, it prints the current rate of the clock
* - 'n' For ignored argument
*
* ** Please update also Documentation/printk-formats.txt when making changes **
*
Expand Down Expand Up @@ -1814,8 +1813,10 @@ int format_decode(const char *fmt, struct printf_spec *spec)
* @fmt: The format string to use
* @args: Arguments for the format string
*
* This function follows C99 vsnprintf, but has some extensions:
* %n is ignored
* This function generally follows C99 vsnprintf, but has some
* extensions and a few limitations:
*
* %n is unsupported
* %p* is handled by pointer()
*
* See pointer() or Documentation/printk-formats.txt for more
Expand Down

0 comments on commit d7ec9a0

Please sign in to comment.