Commit 20036fdc authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

Add kerneldoc documentation for new printk format extensions

Add documentation in kerneldoc for new printk format extensions

This patch documents the new %pS/%pF options in printk in kernel doc.

Hope I didn't miss any other extension.
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9536727e
...@@ -593,6 +593,8 @@ static int have_callable_console(void) ...@@ -593,6 +593,8 @@ static int have_callable_console(void)
* *
* See also: * See also:
* printf(3) * printf(3)
*
* See the vsnprintf() documentation for format string extensions over C99.
*/ */
asmlinkage int printk(const char *fmt, ...) asmlinkage int printk(const char *fmt, ...)
......
...@@ -565,6 +565,10 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field ...@@ -565,6 +565,10 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field
* @fmt: The format string to use * @fmt: The format string to use
* @args: Arguments for the format string * @args: Arguments for the format string
* *
* This function follows C99 vsnprintf, but has some extensions:
* %pS output the name of a text symbol
* %pF output the name of a function pointer
*
* The return value is the number of characters which would * The return value is the number of characters which would
* be generated for the given input, excluding the trailing * be generated for the given input, excluding the trailing
* '\0', as per ISO C99. If you want to have the exact * '\0', as per ISO C99. If you want to have the exact
...@@ -806,6 +810,8 @@ EXPORT_SYMBOL(vsnprintf); ...@@ -806,6 +810,8 @@ EXPORT_SYMBOL(vsnprintf);
* *
* Call this function if you are already dealing with a va_list. * Call this function if you are already dealing with a va_list.
* You probably want scnprintf() instead. * You probably want scnprintf() instead.
*
* See the vsnprintf() documentation for format string extensions over C99.
*/ */
int vscnprintf(char *buf, size_t size, const char *fmt, va_list args) int vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
{ {
...@@ -828,6 +834,8 @@ EXPORT_SYMBOL(vscnprintf); ...@@ -828,6 +834,8 @@ EXPORT_SYMBOL(vscnprintf);
* generated for the given input, excluding the trailing null, * generated for the given input, excluding the trailing null,
* as per ISO C99. If the return is greater than or equal to * as per ISO C99. If the return is greater than or equal to
* @size, the resulting string is truncated. * @size, the resulting string is truncated.
*
* See the vsnprintf() documentation for format string extensions over C99.
*/ */
int snprintf(char * buf, size_t size, const char *fmt, ...) int snprintf(char * buf, size_t size, const char *fmt, ...)
{ {
...@@ -877,6 +885,8 @@ EXPORT_SYMBOL(scnprintf); ...@@ -877,6 +885,8 @@ EXPORT_SYMBOL(scnprintf);
* *
* Call this function if you are already dealing with a va_list. * Call this function if you are already dealing with a va_list.
* You probably want sprintf() instead. * You probably want sprintf() instead.
*
* See the vsnprintf() documentation for format string extensions over C99.
*/ */
int vsprintf(char *buf, const char *fmt, va_list args) int vsprintf(char *buf, const char *fmt, va_list args)
{ {
...@@ -894,6 +904,8 @@ EXPORT_SYMBOL(vsprintf); ...@@ -894,6 +904,8 @@ EXPORT_SYMBOL(vsprintf);
* The function returns the number of characters written * The function returns the number of characters written
* into @buf. Use snprintf() or scnprintf() in order to avoid * into @buf. Use snprintf() or scnprintf() in order to avoid
* buffer overflows. * buffer overflows.
*
* See the vsnprintf() documentation for format string extensions over C99.
*/ */
int sprintf(char * buf, const char *fmt, ...) int sprintf(char * buf, const char *fmt, ...)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment