zbyszek / rpms / grub2

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