Skip to content

Commit

Permalink
lib/vsprintf: Make strspec global
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andy Shevchenko authored and Petr Mladek committed Apr 11, 2018
1 parent ce0b491 commit abd4fe6
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions lib/vsprintf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit abd4fe6

Please sign in to comment.