|
 |
f96e0b |
From aa3e16df89e62894f53aca3a255bf1b06f5cbe24 Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
Date: Fri, 1 Mar 2013 13:46:24 +0100
|
|
|
f96e0b |
Subject: [PATCH 177/482] * grub-core/kern/emu/hostdisk.c
|
|
|
f96e0b |
(read_device_map): Remove nested function.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 5 +++++
|
|
|
f96e0b |
grub-core/kern/emu/hostdisk.c | 15 ++++-----------
|
|
|
f96e0b |
2 files changed, 9 insertions(+), 11 deletions(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index fda449d..f324b92 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,5 +1,10 @@
|
|
|
f96e0b |
2013-03-01 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
+ * grub-core/kern/emu/hostdisk.c (read_device_map): Remove nested
|
|
|
f96e0b |
+ function.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+2013-03-01 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
* grub-core/gentrigtables.c: Make tables const.
|
|
|
f96e0b |
|
|
|
f96e0b |
2013-03-01 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
|
|
|
f96e0b |
index 92ce1d9..62a579b 100644
|
|
|
f96e0b |
--- a/grub-core/kern/emu/hostdisk.c
|
|
|
f96e0b |
+++ b/grub-core/kern/emu/hostdisk.c
|
|
|
f96e0b |
@@ -1209,13 +1209,6 @@ read_device_map (const char *dev_map)
|
|
|
f96e0b |
int lineno = 0;
|
|
|
f96e0b |
struct stat st;
|
|
|
f96e0b |
|
|
|
f96e0b |
- auto void show_error (const char *msg)
|
|
|
f96e0b |
- __attribute__ ((noreturn));
|
|
|
f96e0b |
- void __attribute__ ((noreturn)) show_error (const char *msg)
|
|
|
f96e0b |
- {
|
|
|
f96e0b |
- grub_util_error ("%s:%d: %s", dev_map, lineno, msg);
|
|
|
f96e0b |
- }
|
|
|
f96e0b |
-
|
|
|
f96e0b |
if (dev_map[0] == '\0')
|
|
|
f96e0b |
{
|
|
|
f96e0b |
grub_util_info ("no device.map");
|
|
|
f96e0b |
@@ -1250,14 +1243,14 @@ read_device_map (const char *dev_map)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
char *tmp;
|
|
|
f96e0b |
tmp = xasprintf (_("missing `%c' symbol"), '(');
|
|
|
f96e0b |
- show_error (tmp);
|
|
|
f96e0b |
+ grub_util_error ("%s:%d: %s", dev_map, lineno, tmp);
|
|
|
f96e0b |
}
|
|
|
f96e0b |
|
|
|
f96e0b |
p++;
|
|
|
f96e0b |
/* Find a free slot. */
|
|
|
f96e0b |
drive = find_free_slot ();
|
|
|
f96e0b |
if (drive < 0)
|
|
|
f96e0b |
- show_error (_("device count exceeds limit"));
|
|
|
f96e0b |
+ grub_util_error ("%s:%d: %s", dev_map, lineno, _("device count exceeds limit"));
|
|
|
f96e0b |
|
|
|
f96e0b |
e = p;
|
|
|
f96e0b |
p = strchr (p, ')');
|
|
|
f96e0b |
@@ -1265,7 +1258,7 @@ read_device_map (const char *dev_map)
|
|
|
f96e0b |
{
|
|
|
f96e0b |
char *tmp;
|
|
|
f96e0b |
tmp = xasprintf (_("missing `%c' symbol"), ')');
|
|
|
f96e0b |
- show_error (tmp);
|
|
|
f96e0b |
+ grub_util_error ("%s:%d: %s", dev_map, lineno, tmp);
|
|
|
f96e0b |
}
|
|
|
f96e0b |
|
|
|
f96e0b |
map[drive].drive = 0;
|
|
|
f96e0b |
@@ -1310,7 +1303,7 @@ read_device_map (const char *dev_map)
|
|
|
f96e0b |
p++;
|
|
|
f96e0b |
|
|
|
f96e0b |
if (*p == '\0')
|
|
|
f96e0b |
- show_error (_("filename expected"));
|
|
|
f96e0b |
+ grub_util_error ("%s:%d: %s", dev_map, lineno, _("filename expected"));
|
|
|
f96e0b |
|
|
|
f96e0b |
/* NUL-terminate the filename. */
|
|
|
f96e0b |
e = p;
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|