lkml.org 
[lkml]   [2022]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 18/32] vsprintf: flags_string() no longer takes printf_spec
    Date
    From: Kent Overstreet <kent.overstreet@gmail.com>

    We're attempting to consolidate printf_spec and format string handling
    in the top level vpr_buf(), this changes time_and_date() to not
    take printf_spec.

    Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
    Cc: Petr Mladek <pmladek@suse.com>
    Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
    ---
    lib/vsprintf.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/lib/vsprintf.c b/lib/vsprintf.c
    index 784f7cb64926..38d16aa79e56 100644
    --- a/lib/vsprintf.c
    +++ b/lib/vsprintf.c
    @@ -1917,12 +1917,12 @@ void format_page_flags(struct printbuf *out, unsigned long flags)

    static noinline_for_stack
    void flags_string(struct printbuf *out, void *flags_ptr,
    - struct printf_spec spec, const char *fmt)
    + const char *fmt)
    {
    unsigned long flags;
    const struct trace_print_flags *names;

    - if (check_pointer_spec(out, flags_ptr, spec))
    + if (check_pointer(out, flags_ptr))
    return;

    switch (fmt[1]) {
    @@ -1937,7 +1937,7 @@ void flags_string(struct printbuf *out, void *flags_ptr,
    names = gfpflag_names;
    break;
    default:
    - return error_string_spec(out, "(%pG?)", spec);
    + return error_string(out, "(%pG?)");
    }

    return format_flags(out, flags, names);
    @@ -2310,7 +2310,8 @@ void pointer(struct printbuf *out, const char *fmt,
    #endif

    case 'G':
    - return flags_string(out, ptr, spec, fmt);
    + flags_string(out, ptr, fmt);
    + return do_width_precision(out, prev_pos, spec);
    case 'O':
    return device_node_string(out, ptr, spec, fmt + 1);
    case 'f':
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-08-08 04:44    [W:4.082 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site