From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Tobin C. Harding" <me@tobin.cc>,
linux@rasmusvillemoes.dk, Petr Mladek <pmladek@suse.com>,
Joe Perches <joe@perches.com>,
linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 2/7] lib/vsprintf: Deduplicate pointer_string()
Date: Fri, 16 Feb 2018 21:28:01 +0200 [thread overview]
Message-ID: <20180216192806.68914-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20180216192806.68914-1-andriy.shevchenko@linux.intel.com>
There is an exact code at the end of ptr_to_id().
Replace it by calling pointer_string() directly.
This is followup to the commit
ad67b74d2469 ("printk: hash addresses printed with %p").
Cc: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
lib/vsprintf.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index d7a708f82559..b6d254723828 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1697,10 +1697,9 @@ early_initcall(initialize_ptr_random);
static char *ptr_to_id(char *buf, char *end, void *ptr, struct printf_spec spec)
{
unsigned long hashval;
- const int default_width = 2 * sizeof(ptr);
if (unlikely(!have_filled_random_ptr_key)) {
- spec.field_width = default_width;
+ spec.field_width = 2 * sizeof(ptr);
/* string length must be less than default_width */
return string(buf, end, "(ptrval)", spec);
}
@@ -1715,15 +1714,7 @@ static char *ptr_to_id(char *buf, char *end, void *ptr, struct printf_spec spec)
#else
hashval = (unsigned long)siphash_1u32((u32)ptr, &ptr_key);
#endif
-
- spec.flags |= SMALL;
- if (spec.field_width == -1) {
- spec.field_width = default_width;
- spec.flags |= ZEROPAD;
- }
- spec.base = 16;
-
- return number(buf, end, hashval, spec);
+ return pointer_string(buf, end, (const void *)hashval, spec);
}
/*
--
2.15.1
next prev parent reply other threads:[~2018-02-16 19:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-16 19:28 [PATCH v1 1/7] lib/test_printf: Mark big constant with ULL Andy Shevchenko
2018-02-16 19:28 ` Andy Shevchenko [this message]
2018-02-16 19:28 ` [PATCH v1 3/7] lib/vsprintf: Replace ' ' with '_' before crng is ready Andy Shevchenko
2018-02-16 19:28 ` [PATCH v1 4/7] lib/vsprintf: Remove useless NULL checks Andy Shevchenko
2018-02-16 19:28 ` [PATCH v1 5/7] lib/vsprintf: Make decspec global Andy Shevchenko
2018-02-16 19:28 ` [PATCH v1 6/7] lib/vsprintf: Make strspec global Andy Shevchenko
2018-02-16 19:28 ` [PATCH v1 7/7] lib/vsprintf: Mark expected switch fall-through Andy Shevchenko
2018-02-16 20:44 ` [PATCH v1 1/7] lib/test_printf: Mark big constant with ULL 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=20180216192806.68914-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=me@tobin.cc \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.