mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
|
Date: Tue, 27 Nov 2012 16:58:39 -0200
|
|
Subject: [PATCH] Add %X option to printf functions.
|
|
|
|
---
|
|
grub-core/kern/misc.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
|
|
index cd63a8cea73..2656a670e09 100644
|
|
--- a/grub-core/kern/misc.c
|
|
+++ b/grub-core/kern/misc.c
|
|
@@ -588,7 +588,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r)
|
|
static inline char *
|
|
grub_lltoa (char *str, int c, unsigned long long n)
|
|
{
|
|
- unsigned base = (c == 'x') ? 16 : 10;
|
|
+ unsigned base = ((c == 'x') || (c == 'X')) ? 16 : 10;
|
|
char *p;
|
|
|
|
if ((long long) n < 0 && c == 'd')
|
|
@@ -603,7 +603,7 @@ grub_lltoa (char *str, int c, unsigned long long n)
|
|
do
|
|
{
|
|
unsigned d = (unsigned) (n & 0xf);
|
|
- *p++ = (d > 9) ? d + 'a' - 10 : d + '0';
|
|
+ *p++ = (d > 9) ? d + ((c == 'x') ? 'a' : 'A') - 10 : d + '0';
|
|
}
|
|
while (n >>= 4);
|
|
else
|
|
@@ -676,6 +676,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
|
|
{
|
|
case 'p':
|
|
case 'x':
|
|
+ case 'X':
|
|
case 'u':
|
|
case 'd':
|
|
case 'c':
|
|
@@ -762,6 +763,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
|
|
switch (c)
|
|
{
|
|
case 'x':
|
|
+ case 'X':
|
|
case 'u':
|
|
args->ptr[curn].type = UNSIGNED_INT + longfmt;
|
|
break;
|
|
@@ -900,6 +902,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0,
|
|
c = 'x';
|
|
/* Fall through. */
|
|
case 'x':
|
|
+ case 'X':
|
|
case 'u':
|
|
case 'd':
|
|
{
|