mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +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>
31 lines
1 KiB
Diff
31 lines
1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Mon, 11 Feb 2019 15:14:10 +0100
|
|
Subject: [PATCH] Don't make grub_strtoull() print an error if no conversion is
|
|
performed
|
|
|
|
Callers can check if grub_errno was set to GRUB_ERR_BAD_NUMBER, so there's
|
|
no need to print an error if a conversion couldn't be performed. This just
|
|
pollutes the output with noisy error messages.
|
|
|
|
Resolves: rhbz#1674512
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
---
|
|
grub-core/kern/misc.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
|
|
index f6eaa7b4df8..2477eb609ba 100644
|
|
--- a/grub-core/kern/misc.c
|
|
+++ b/grub-core/kern/misc.c
|
|
@@ -473,8 +473,7 @@ grub_strtoull (const char *str, const char ** const end, int base)
|
|
|
|
if (! found)
|
|
{
|
|
- grub_error (GRUB_ERR_BAD_NUMBER,
|
|
- N_("unrecognized number"));
|
|
+ grub_errno = GRUB_ERR_BAD_NUMBER;
|
|
return 0;
|
|
}
|
|
|