Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-04 04:06:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/vsprintf: Make strspec global

Browse Source 
There are places where default specification to print strings
is in use.

Make it global and convert existing users.

Link: http://lkml.kernel.org/r/20180216210711.79901-3-andriy.shevchenko@linux.intel.com
To: "Tobin C . Harding" <me@tobin.cc>
To: linux@rasmusvillemoes.dk
To: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
To: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
This commit is contained in:
Andy Shevchenko 2018-02-16 23:07:05 +02:00 committed by Petr Mladek
parent ce0b4910bd
commit abd4fe6276
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/vsprintf.c
View File

@ -693,6 +693,11 @@ char *symbol_string(char *buf, char *end, void *ptr,
#endif #endif
} }
static const struct printf_spec default_str_spec = {
.field_width = -1,
.precision = -1,
};
static const struct printf_spec default_dec_spec = { static const struct printf_spec default_dec_spec = {
.base = 10, .base = 10,
.precision = -1, .precision = -1,
@ -1461,10 +1466,6 @@ char *format_flags(char *buf, char *end, unsigned long flags,
const struct trace_print_flags *names) const struct trace_print_flags *names)
{ {
unsigned long mask; unsigned long mask;
const struct printf_spec strspec = {
.field_width = -1,
.precision = -1,
};
const struct printf_spec numspec = { const struct printf_spec numspec = {
.flags = SPECIAL|SMALL, .flags = SPECIAL|SMALL,
.field_width = -1, .field_width = -1,
@ -1477,7 +1478,7 @@ char *format_flags(char *buf, char *end, unsigned long flags,
if ((flags & mask) != mask) if ((flags & mask) != mask)
continue; continue;
buf = string(buf, end, names->name, strspec); buf = string(buf, end, names->name, default_str_spec);
flags &= ~mask; flags &= ~mask;
if (flags) { if (flags) {
@ -1535,22 +1536,18 @@ char *device_node_gen_full_name(const struct device_node *np, char *buf, char *e
{ {
int depth; int depth;
const struct device_node *parent = np->parent; const struct device_node *parent = np->parent;
static const struct printf_spec strspec = {
.field_width = -1,
.precision = -1,
};
/* special case for root node */ /* special case for root node */
if (!parent) if (!parent)
return string(buf, end, "/", strspec); return string(buf, end, "/", default_str_spec);
for (depth = 0; parent->parent; depth++) for (depth = 0; parent->parent; depth++)
parent = parent->parent; parent = parent->parent;
for ( ; depth >= 0; depth--) { for ( ; depth >= 0; depth--) {
buf = string(buf, end, "/", strspec); buf = string(buf, end, "/", default_str_spec);
buf = string(buf, end, device_node_name_for_depth(np, depth), buf = string(buf, end, device_node_name_for_depth(np, depth),
strspec); default_str_spec);
} }
return buf; return buf;
} }