Attachment 653057 Details for Bug 873406 – [PATCH 1/3] Add %X option to printf functions.

[patch] [PATCH 1/3] Add %X option to printf functions.

grub-2.00-add-X-option-to-printf-functions.patch (text/plain), 1.64 KB, created by Paulo Flabiano Smorigo on 2012-11-27 19:45:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo Flabiano Smorigo

Created: 2012-11-27 19:45:02 UTC

Size: 1.64 KB

patch

obsolete

>From 80f81f233bf74aac740d7a299d075ea46c9c7bd4 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 1/3] 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 95d4624..8ac087a 100644
>--- a/grub-core/kern/misc.c
>+++ b/grub-core/kern/misc.c
>@@ -596,7 +596,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r)
> static 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')
>@@ -611,7 +611,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
>@@ -702,6 +702,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0, va_list a
> 	{
> 	case 'p':
> 	case 'x':
>+	case 'X':
> 	case 'u':
> 	case 'd':
> 	case 'c':
>@@ -777,6 +778,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0, va_list a
>       switch (c)
> 	{
> 	case 'x':
>+	case 'X':
> 	case 'u':
> 	case 'd':
> 	  if (longlongfmt)
>@@ -918,6 +920,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0, va_list a
> 	  longlongfmt |= (sizeof (void *) == sizeof (long long));
> 	  /* Fall through. */
> 	case 'x':
>+	case 'X':
> 	case 'u':
> 	  unsig = 1;
> 	  /* Fall through. */
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 873406: 653057 | 653058 | 653059