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