grub2/0178-util-grub-editenv.c-list_variables-Move-print_var-ou.patch
Peter Jones f74b50e380 Rebase to upstream, fix a pile of bugs. The usual.
Signed-off-by: Peter Jones <pjones@redhat.com>
2013-06-12 15:37:08 -04:00

60 lines
1.5 KiB
Diff

From 2c4eef8547deac274f15a90781548d74227a78f0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 1 Mar 2013 13:52:05 +0100
Subject: [PATCH 178/482] * util/grub-editenv.c (list_variables): Move
print_var out of its parent.
---
ChangeLog | 5 +++++
util/grub-editenv.c | 14 +++++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f324b92..0bad8bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-03-01 Vladimir Serbinenko <phcoder@gmail.com>
+ * util/grub-editenv.c (list_variables): Move print_var out of its
+ parent.
+
+2013-03-01 Vladimir Serbinenko <phcoder@gmail.com>
+
* grub-core/kern/emu/hostdisk.c (read_device_map): Remove nested
function.
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index 175ca8e..9b51acf 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -184,18 +184,18 @@ open_envblk_file (const char *name)
return envblk;
}
+static int
+print_var (const char *varname, const char *value)
+{
+ printf ("%s=%s\n", varname, value);
+ return 0;
+}
+
static void
list_variables (const char *name)
{
grub_envblk_t envblk;
- auto int print_var (const char *varname, const char *value);
- int print_var (const char *varname, const char *value)
- {
- printf ("%s=%s\n", varname, value);
- return 0;
- }
-
envblk = open_envblk_file (name);
grub_envblk_iterate (envblk, print_var);
grub_envblk_close (envblk);
--
1.8.2.1