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>
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Sun, 28 Jun 2015 13:09:58 -0400
|
|
Subject: [PATCH] Add grub_qdprintf() - grub_dprintf() without the file+line
|
|
number.
|
|
|
|
This just makes copy+paste of our debug loading info easier.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/kern/misc.c | 18 ++++++++++++++++++
|
|
include/grub/misc.h | 2 ++
|
|
2 files changed, 20 insertions(+)
|
|
|
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
|
|
index 5c2d2039d0b..0e89c483d5e 100644
|
|
--- a/grub-core/kern/misc.c
|
|
+++ b/grub-core/kern/misc.c
|
|
@@ -190,6 +190,24 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
|
|
}
|
|
}
|
|
|
|
+void
|
|
+grub_qdprintf (const char *condition, const char *fmt, ...)
|
|
+{
|
|
+ va_list args;
|
|
+ const char *debug = grub_env_get ("debug");
|
|
+
|
|
+ if (! debug)
|
|
+ return;
|
|
+
|
|
+ if (grub_strword (debug, "all") || grub_strword (debug, condition))
|
|
+ {
|
|
+ va_start (args, fmt);
|
|
+ grub_vprintf (fmt, args);
|
|
+ va_end (args);
|
|
+ grub_refresh ();
|
|
+ }
|
|
+}
|
|
+
|
|
#define PREALLOC_SIZE 255
|
|
|
|
int
|
|
diff --git a/include/grub/misc.h b/include/grub/misc.h
|
|
index 0f5abc4638e..de9016ab709 100644
|
|
--- a/include/grub/misc.h
|
|
+++ b/include/grub/misc.h
|
|
@@ -372,6 +372,8 @@ void EXPORT_FUNC(grub_real_dprintf) (const char *file,
|
|
const int line,
|
|
const char *condition,
|
|
const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 4, 5)));
|
|
+void EXPORT_FUNC(grub_qdprintf) (const char *condition,
|
|
+ const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 2, 3)));
|
|
int EXPORT_FUNC(grub_vprintf) (const char *fmt, va_list args);
|
|
int EXPORT_FUNC(grub_snprintf) (char *str, grub_size_t n, const char *fmt, ...)
|
|
__attribute__ ((format (GNU_PRINTF, 3, 4)));
|