Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28405372 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

vsprintf: fix io/mem resource width 



The leading "0x" consumes field width, so leave space for it in addition to
the 4 or 8 hex digits.  This means we'll print "0x0000-0x01df" rather than
"0x00-0x1df", for example.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 3368dd29

lib/vsprintf.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -598,11 +598,11 @@ static char *resource_string(char *buf, char *end, struct resource *res, 
				struct printf_spec spec)

				struct printf_spec spec)

{

{

#ifndef IO_RSRC_PRINTK_SIZE

#ifndef IO_RSRC_PRINTK_SIZE

#define IO_RSRC_PRINTK_SIZE	4

#define IO_RSRC_PRINTK_SIZE	6

#endif

#endif





#ifndef MEM_RSRC_PRINTK_SIZE

#ifndef MEM_RSRC_PRINTK_SIZE

#define MEM_RSRC_PRINTK_SIZE	8

#define MEM_RSRC_PRINTK_SIZE	10

#endif

#endif

	struct printf_spec num_spec = {

	struct printf_spec num_spec = {

		.base = 16,

		.base = 16,