From: Joe Perches <joe@perches.com>
To: Petr Mladek <pmladek@suse.com>,
Steven Rostedt <rostedt@goodmis.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Jonathan Corbet <corbet@lwn.net>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] vsprintf and docs: Add X to %ph for upper case output
Date: Sat, 21 Aug 2021 19:59:17 -0700 [thread overview]
Message-ID: <6abd83d11f1daa3094f82e92843e8279f302e349.camel@perches.com> (raw)
Uppercase hex output of small char arrays is moderately frequently used.
Add a mechanism to support the %*ph output as uppercase using 'X'.
Signed-off-by: Joe Perches <joe@perches.com>
---
Documentation/core-api/printk-formats.rst | 7 ++++-
lib/vsprintf.c | 48 ++++++++++++++++++++-----------
2 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst
index e08bbe9b0cbf3..01944b0c8adf3 100644
--- a/Documentation/core-api/printk-formats.rst
+++ b/Documentation/core-api/printk-formats.rst
@@ -285,12 +285,17 @@ Raw buffer as a hex string
::
%*ph 00 01 02 ... 3f
+ %*phX 00 01 02 ... 3F
%*phC 00:01:02: ... :3f
+ %*phCX 00:01:02: ... :3F
%*phD 00-01-02- ... -3f
+ %*phDX 00-01-02- ... -3F
%*phN 000102 ... 3f
+ %*phNX 000102 ... 3F
For printing small buffers (up to 64 bytes long) as a hex string with a
-certain separator. For larger buffers consider using
+certain separator. Typical output is lowercase, formats with X are uppercase.
+For larger buffers consider using
:c:func:`print_hex_dump`.
MAC/FDDI addresses
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 134216c45980e..6aca95d5a99f0 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1147,7 +1147,10 @@ char *hex_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
{
int i, len = 1; /* if we pass '%ph[CDN]', field width remains
negative value, fallback to the default */
- char separator;
+ char separator = ' ';
+ int count = 1;
+ bool found = true;
+ bool ucase = false;
if (spec.field_width == 0)
/* nothing to print */
@@ -1156,30 +1159,41 @@ char *hex_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
if (check_pointer(&buf, end, addr, spec))
return buf;
- switch (fmt[1]) {
- case 'C':
- separator = ':';
- break;
- case 'D':
- separator = '-';
- break;
- case 'N':
- separator = 0;
- break;
- default:
- separator = ' ';
- break;
- }
+ do {
+ switch (fmt[count++]) {
+ case 'C':
+ separator = ':';
+ break;
+ case 'D':
+ separator = '-';
+ break;
+ case 'N':
+ separator = 0;
+ break;
+ case 'X':
+ ucase = true;
+ break;
+ default:
+ found = false;
+ break;
+ }
+ } while (found);
if (spec.field_width > 0)
len = min_t(int, spec.field_width, 64);
for (i = 0; i < len; ++i) {
- if (buf < end)
+ if (buf < end) {
*buf = hex_asc_hi(addr[i]);
+ if (ucase)
+ *buf = toupper(*buf);
+ }
++buf;
- if (buf < end)
+ if (buf < end) {
*buf = hex_asc_lo(addr[i]);
+ if (ucase)
+ *buf = toupper(*buf);
+ }
++buf;
if (separator && i != len - 1) {
next reply other threads:[~2021-08-22 2:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-22 2:59 Joe Perches [this message]
2021-08-22 8:31 ` [PATCH] vsprintf and docs: Add X to %ph for upper case output Andy Shevchenko
2021-08-22 8:45 ` Joe Perches
2021-08-22 8:53 ` Andy Shevchenko
2021-08-22 8:57 ` Joe Perches
2021-08-22 9:00 ` Andy Shevchenko
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=6abd83d11f1daa3094f82e92843e8279f302e349.camel@perches.com \
--to=joe@perches.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=senozhatsky@chromium.org \
/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).