Commit 5e057981 authored Oct 26, 2010 by Joe Perches Committed by Linus Torvalds Oct 26, 2010

vsprintf.c: use default pointer field size for "(null)" strings



It might be nicer to align the output.

For instance, ACPI messages sometimes have "(null)" pointers.

$ dmesg | grep "(null)"  -A 1 -B 1
[    0.198733] ACPI: Dynamic OEM Table Load:
[    0.198745] ACPI: SSDT (null) 00239 (v02  PmRef  Cpu0Ist 00003000 INTL 20051117)
[    0.199294] ACPI: SSDT 7f596e10 001C7 (v02  PmRef  Cpu0Cst 00003001 INTL 20051117)
[    0.200708] ACPI: Dynamic OEM Table Load:
[    0.200721] ACPI: SSDT (null) 001C7 (v02  PmRef  Cpu0Cst 00003001 INTL 20051117)
[    0.201950] ACPI: SSDT 7f597f10 000D0 (v02  PmRef  Cpu1Ist 00003000 INTL 20051117)
[    0.203386] ACPI: Dynamic OEM Table Load:
[    0.203398] ACPI: SSDT (null) 000D0 (v02  PmRef  Cpu1Ist 00003000 INTL 20051117)
[    0.203871] ACPI: SSDT 7f595f10 00083 (v02  PmRef  Cpu1Cst 00003000 INTL 20051117)
[    0.205301] ACPI: Dynamic OEM Table Load:
[    0.205315] ACPI: SSDT (null) 00083 (v02  PmRef  Cpu1Cst 00003000 INTL 20051117)

[akpm@linux-foundation.org: add code comment]
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 77006a0a

lib/vsprintf.c

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -988,8 +988,15 @@ static noinline_for_stack
	char pointer(const char fmt, char buf, char end, void *ptr,		char pointer(const char fmt, char buf, char end, void *ptr,
	struct printf_spec spec)		struct printf_spec spec)
	{		{
	if (!ptr)		if (!ptr) {
			/*
			* Print (null) with the same width as a pointer so it makes
			* tabular output look nice.
			*/
			if (spec.field_width == -1)
			spec.field_width = 2 * sizeof(void *);
	return string(buf, end, "(null)", spec);		return string(buf, end, "(null)", spec);
			}

	switch (*fmt) {		switch (*fmt) {
	case 'F':		case 'F':