lkml.org 
[lkml]   [2018]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 3/9] lib/vsprintf: Make strspec global
    Date
    There are places where default specification to print strings
    is in use.

    Make it global and convert existing users.

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    lib/vsprintf.c | 21 +++++++++------------
    1 file 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;
    }
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-02-16 22:07    [W:4.258 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site