|
 |
a5bd9f6 |
From d4428b6c09ead48f694ccedd22dc9e9cb773dc77 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Sat, 2 Mar 2013 11:45:01 +0100
|
|
|
a5bd9f6 |
Subject: [PATCH 180/364] * grub-core/commands/loadenv.c
|
|
|
a5bd9f6 |
(grub_cmd_list_env): Move print_var out of its parent.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 5 +++++
|
|
|
a5bd9f6 |
grub-core/commands/loadenv.c | 16 ++++++++--------
|
|
|
a5bd9f6 |
2 files changed, 13 insertions(+), 8 deletions(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index 0ca4aae..ddd903a 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,5 +1,10 @@
|
|
|
a5bd9f6 |
2013-03-02 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
+ * grub-core/commands/loadenv.c (grub_cmd_list_env): Move print_var
|
|
|
a5bd9f6 |
+ out of its parent.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+2013-03-02 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
* grub-core/fs/hfs.c: Remove nested functions.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
2013-03-01 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
|
|
|
a5bd9f6 |
index 4b94173..c0a42c5 100644
|
|
|
a5bd9f6 |
--- a/grub-core/commands/loadenv.c
|
|
|
a5bd9f6 |
+++ b/grub-core/commands/loadenv.c
|
|
|
a5bd9f6 |
@@ -147,6 +147,14 @@ grub_cmd_load_env (grub_extcmd_context_t ctxt,
|
|
|
a5bd9f6 |
return grub_errno;
|
|
|
a5bd9f6 |
}
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
+/* Print all variables in current context. */
|
|
|
a5bd9f6 |
+static int
|
|
|
a5bd9f6 |
+print_var (const char *name, const char *value)
|
|
|
a5bd9f6 |
+{
|
|
|
a5bd9f6 |
+ grub_printf ("%s=%s\n", name, value);
|
|
|
a5bd9f6 |
+ return 0;
|
|
|
a5bd9f6 |
+}
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
static grub_err_t
|
|
|
a5bd9f6 |
grub_cmd_list_env (grub_extcmd_context_t ctxt,
|
|
|
a5bd9f6 |
int argc __attribute__ ((unused)),
|
|
|
a5bd9f6 |
@@ -156,14 +164,6 @@ grub_cmd_list_env (grub_extcmd_context_t ctxt,
|
|
|
a5bd9f6 |
grub_file_t file;
|
|
|
a5bd9f6 |
grub_envblk_t envblk;
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
- /* Print all variables in current context. */
|
|
|
a5bd9f6 |
- auto int print_var (const char *name, const char *value);
|
|
|
a5bd9f6 |
- int print_var (const char *name, const char *value)
|
|
|
a5bd9f6 |
- {
|
|
|
a5bd9f6 |
- grub_printf ("%s=%s\n", name, value);
|
|
|
a5bd9f6 |
- return 0;
|
|
|
a5bd9f6 |
- }
|
|
|
a5bd9f6 |
-
|
|
|
a5bd9f6 |
file = open_envblk_file ((state[0].set) ? state[0].arg : 0);
|
|
|
a5bd9f6 |
if (! file)
|
|
|
a5bd9f6 |
return grub_errno;
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|