diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-02-16 23:07:05 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2018-04-11 10:20:47 +0200 |
| commit | abd4fe6276fa1111453f96cefa7145b6d15868ca (patch) | |
| tree | ed35c1163fac186915a8f377c4a1499f5f07ea57 /lib/vsprintf.c | |
| parent | ce0b4910bdf8c515fe8be49a6c582ee8b206ca0a (diff) | |
| download | lwn-abd4fe6276fa1111453f96cefa7145b6d15868ca.tar.gz lwn-abd4fe6276fa1111453f96cefa7145b6d15868ca.zip | |
lib/vsprintf: Make strspec global
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>
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 8f29af063d8a..0c23b006b495 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -693,6 +693,11 @@ char *symbol_string(char *buf, char *end, void *ptr, #endif } +static const struct printf_spec default_str_spec = { + .field_width = -1, + .precision = -1, +}; + static const struct printf_spec default_dec_spec = { .base = 10, .precision = -1, @@ -1461,10 +1466,6 @@ char *format_flags(char *buf, char *end, unsigned long flags, const struct trace_print_flags *names) { unsigned long mask; - const struct printf_spec strspec = { - .field_width = -1, - .precision = -1, - }; const struct printf_spec numspec = { .flags = SPECIAL|SMALL, .field_width = -1, @@ -1477,7 +1478,7 @@ char *format_flags(char *buf, char *end, unsigned long flags, if ((flags & mask) != mask) continue; - buf = string(buf, end, names->name, strspec); + buf = string(buf, end, names->name, default_str_spec); flags &= ~mask; if (flags) { @@ -1535,22 +1536,18 @@ char *device_node_gen_full_name(const struct device_node *np, char *buf, char *e { int depth; const struct device_node *parent = np->parent; - static const struct printf_spec strspec = { - .field_width = -1, - .precision = -1, - }; /* special case for root node */ if (!parent) - return string(buf, end, "/", strspec); + return string(buf, end, "/", default_str_spec); for (depth = 0; parent->parent; depth++) parent = parent->parent; 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), - strspec); + default_str_spec); } return buf; } |