mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 06:22:43 +00:00
dc178ac546
- Use version field to sort BLS entries if id field isn't defined - Add version field to BLS fragments generated by 20-grub.install Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
From 8c4b2eaa204f0ea0377ca4592d2be6029fdb9be7 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Sun, 28 Jun 2015 13:09:58 -0400
|
|
Subject: [PATCH 213/238] 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 493e328d968..4607e8defa9 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)));
|
|
--
|
|
2.17.0
|
|
|