iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vsprintf: split out '%p' handling logic

Browse Source 
The actual code is the same, just split out into a helper function.
This makes it easier to read, and allows for simple future extension
of %p handling.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2008-07-06 16:16:15 -07:00
parent 0f9bfa569d
commit 78a8bf69b3
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/vsprintf.c
View File

@ -511,6 +511,16 @@ static char *string(char *buf, char *end, char *s, int field_width, int precisio
return buf; return buf;
} }
static char *pointer(char *buf, char *end, void *ptr, int field_width, int precision, int flags)
{
flags |= SMALL;
if (field_width == -1) {
field_width = 2*sizeof(void *);
flags |= ZEROPAD;
}
return number(buf, end, (unsigned long) ptr, 16, field_width, precision, flags);
}
/** /**
* vsnprintf - Format a string and place it in a buffer * vsnprintf - Format a string and place it in a buffer
* @buf: The buffer to place the result into * @buf: The buffer to place the result into
@ -653,17 +663,9 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
continue; continue;
case 'p': case 'p':
flags |= SMALL; str = pointer(str, end, va_arg(args, void *), field_width, precision, flags);
if (field_width == -1) {
field_width = 2*sizeof(void *);
flags |= ZEROPAD;
}
str = number(str, end,
(unsigned long) va_arg(args, void *),
16, field_width, precision, flags);
continue; continue;
case 'n': case 'n':
/* FIXME: /* FIXME:
* What does C99 say about the overflow case here? */ * What does C99 say about the overflow case here? */