From: Kent Overstreet <kent.overstreet@linux.dev>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org,
Kent Overstreet <kent.overstreet@gmail.com>,
Petr Mladek <pmladek@suse.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>
Subject: [PATCH 14/32] vsprintf: Refactor fourcc_string()
Date: Sun, 14 Aug 2022 17:19:53 -0400 [thread overview]
Message-ID: <20220814212011.1727798-15-kent.overstreet@linux.dev> (raw)
In-Reply-To: <20220814212011.1727798-1-kent.overstreet@linux.dev>
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 fourcc_string() to
not take printf_spec
- With the new printbuf helpers there's no need to use a separate stack
allocated buffer, so this patch deletes it.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
lib/vsprintf.c | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index f8abeee393..e3189c9f2d 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1701,17 +1701,15 @@ void netdev_bits(struct printbuf *out, const void *addr,
static noinline_for_stack
void fourcc_string(struct printbuf *out, const u32 *fourcc,
- struct printf_spec spec, const char *fmt)
+ const char *fmt)
{
- char output_buf[sizeof("0123 little-endian (0x01234567)")];
- struct printbuf output = PRINTBUF_EXTERN(output_buf, sizeof(output_buf));
unsigned int i;
u32 orig, val;
if (fmt[1] != 'c' || fmt[2] != 'c')
- return error_string_spec(out, "(%p4?)", spec);
+ return error_string(out, "(%p4?)");
- if (check_pointer_spec(out, fourcc, spec))
+ if (check_pointer(out, fourcc))
return;
orig = get_unaligned(fourcc);
@@ -1721,18 +1719,16 @@ void fourcc_string(struct printbuf *out, const u32 *fourcc,
unsigned char c = val >> (i * 8);
/* Print non-control ASCII characters as-is, dot otherwise */
- prt_char(&output, isascii(c) && isprint(c) ? c : '.');
+ prt_char(out, isascii(c) && isprint(c) ? c : '.');
}
- prt_char(&output, ' ');
- prt_str(&output, orig & BIT(31) ? "big-endian" : "little-endian");
-
- prt_char(&output, ' ');
- prt_char(&output, '(');
- special_hex_number(&output, orig, sizeof(u32));
- prt_char(&output, ')');
+ prt_char(out, ' ');
+ prt_str(out, orig & BIT(31) ? "big-endian" : "little-endian");
- string_spec(out, output_buf, spec);
+ prt_char(out, ' ');
+ prt_char(out, '(');
+ special_hex_number(out, orig, sizeof(u32));
+ prt_char(out, ')');
}
static noinline_for_stack
@@ -2336,7 +2332,8 @@ void pointer(struct printbuf *out, const char *fmt,
netdev_bits(out, ptr, fmt);
return do_width_precision(out, prev_pos, spec);
case '4':
- return fourcc_string(out, ptr, spec, fmt);
+ fourcc_string(out, ptr, fmt);
+ return do_width_precision(out, prev_pos, spec);
case 'a':
address_val(out, ptr, fmt);
return do_width_precision(out, prev_pos, spec);
--
2.36.1
next prev parent reply other threads:[~2022-08-14 21:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-14 21:19 Printbufs v6 Kent Overstreet
2022-08-14 21:19 ` [PATCH 01/32] lib/printbuf: New data structure for printing strings Kent Overstreet
2022-08-14 21:19 ` [PATCH 02/32] lib/string_helpers: Convert string_escape_mem() to printbuf Kent Overstreet
2022-08-14 21:19 ` [PATCH 03/32] vsprintf: Convert " Kent Overstreet
2022-08-14 21:19 ` [PATCH 04/32] lib/hexdump: " Kent Overstreet
2022-08-14 21:19 ` [PATCH 05/32] lib/string_helpers: string_get_size() now returns characters wrote Kent Overstreet
2022-08-14 21:19 ` [PATCH 06/32] lib/printbuf: Heap allocation Kent Overstreet
2022-08-14 21:19 ` [PATCH 07/32] lib/printbuf: Tabstops, indenting Kent Overstreet
2022-08-14 21:19 ` [PATCH 08/32] lib/printbuf: Unit specifiers Kent Overstreet
2022-08-14 21:19 ` [PATCH 09/32] vsprintf: Improve number() Kent Overstreet
2022-08-14 21:19 ` [PATCH 10/32] vsprintf: prt_u64_minwidth(), prt_u64() Kent Overstreet
2022-08-14 21:19 ` [PATCH 11/32] test_printf: Drop requirement that sprintf not write past nul Kent Overstreet
2022-08-14 21:19 ` [PATCH 12/32] vsprintf: Start consolidating printf_spec handling Kent Overstreet
2022-08-14 21:19 ` [PATCH 13/32] vsprintf: Refactor resource_string() Kent Overstreet
2022-08-14 21:19 ` Kent Overstreet [this message]
2022-08-14 21:19 ` [PATCH 15/32] vsprintf: Refactor ip_addr_string() Kent Overstreet
2022-08-14 21:19 ` [PATCH 16/32] vsprintf: Refactor mac_address_string() Kent Overstreet
2022-08-14 21:19 ` [PATCH 17/32] vsprintf: time_and_date() no longer takes printf_spec Kent Overstreet
2022-08-14 21:19 ` [PATCH 18/32] vsprintf: flags_string() " Kent Overstreet
2022-08-14 21:19 ` [PATCH 19/32] vsprintf: Refactor device_node_string, fwnode_string Kent Overstreet
2022-08-14 21:19 ` [PATCH 20/32] vsprintf: Refactor hex_string, bitmap_string_list, bitmap_string Kent Overstreet
2022-08-14 21:20 ` [PATCH 21/32] Input/joystick/analog: Convert from seq_buf -> printbuf Kent Overstreet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220814212011.1727798-15-kent.overstreet@linux.dev \
--to=kent.overstreet@linux.dev \
--cc=akpm@linux-foundation.org \
--cc=kent.overstreet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=pmladek@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).