lib/vsprintf.c: move string() below widen_string()
This is pure code movement, making sure the widen_string() helper is defined before the string() function. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: Al Viro <viro@ZenIV.linux.org.uk> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Joe Perches <joe@perches.com> Cc: Kees Cook <keescook@chromium.org> Cc: Maurizio Lombardi <mlombard@redhat.com> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
cfccde04e2
Коммит
95508cfa10
|
@ -510,37 +510,6 @@ char *number(char *buf, char *end, unsigned long long num,
|
|||
return buf;
|
||||
}
|
||||
|
||||
static noinline_for_stack
|
||||
char *string(char *buf, char *end, const char *s, struct printf_spec spec)
|
||||
{
|
||||
int len, i;
|
||||
|
||||
if ((unsigned long)s < PAGE_SIZE)
|
||||
s = "(null)";
|
||||
|
||||
len = strnlen(s, spec.precision);
|
||||
|
||||
if (!(spec.flags & LEFT)) {
|
||||
while (len < spec.field_width--) {
|
||||
if (buf < end)
|
||||
*buf = ' ';
|
||||
++buf;
|
||||
}
|
||||
}
|
||||
for (i = 0; i < len; ++i) {
|
||||
if (buf < end)
|
||||
*buf = *s;
|
||||
++buf; ++s;
|
||||
}
|
||||
while (len < spec.field_width--) {
|
||||
if (buf < end)
|
||||
*buf = ' ';
|
||||
++buf;
|
||||
}
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
static void move_right(char *buf, char *end, unsigned len, unsigned spaces)
|
||||
{
|
||||
size_t size;
|
||||
|
@ -588,6 +557,37 @@ char *widen_string(char *buf, int n, char *end, struct printf_spec spec)
|
|||
return buf;
|
||||
}
|
||||
|
||||
static noinline_for_stack
|
||||
char *string(char *buf, char *end, const char *s, struct printf_spec spec)
|
||||
{
|
||||
int len, i;
|
||||
|
||||
if ((unsigned long)s < PAGE_SIZE)
|
||||
s = "(null)";
|
||||
|
||||
len = strnlen(s, spec.precision);
|
||||
|
||||
if (!(spec.flags & LEFT)) {
|
||||
while (len < spec.field_width--) {
|
||||
if (buf < end)
|
||||
*buf = ' ';
|
||||
++buf;
|
||||
}
|
||||
}
|
||||
for (i = 0; i < len; ++i) {
|
||||
if (buf < end)
|
||||
*buf = *s;
|
||||
++buf; ++s;
|
||||
}
|
||||
while (len < spec.field_width--) {
|
||||
if (buf < end)
|
||||
*buf = ' ';
|
||||
++buf;
|
||||
}
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
static noinline_for_stack
|
||||
char *dentry_name(char *buf, char *end, const struct dentry *d, struct printf_spec spec,
|
||||
const char *fmt)
|
||||
|
|
Загрузка…
Ссылка в новой задаче