vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/kern/emu/hostdisk.c (read_device_map): Remove nested

Browse source 
function.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-03-01 13:46:24 +01:00
parent 5d983f5fc2
commit ca9c260868
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-03-01 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/emu/hostdisk.c (read_device_map): Remove nested
function.
2013-03-01 Vladimir Serbinenko <phcoder@gmail.com> 2013-03-01 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/gentrigtables.c: Make tables const. * grub-core/gentrigtables.c: Make tables const.

15
grub-core/kern/emu/hostdisk.c
View file

@ -1209,13 +1209,6 @@ read_device_map (const char *dev_map)
int lineno = 0; int lineno = 0;
struct stat st; struct stat st;
auto void show_error (const char *msg)
__attribute__ ((noreturn));
void __attribute__ ((noreturn)) show_error (const char *msg)
{
grub_util_error ("%s:%d: %s", dev_map, lineno, msg);
}
if (dev_map[0] == '\0') if (dev_map[0] == '\0')
{ {
grub_util_info ("no device.map"); grub_util_info ("no device.map");
@ -1250,14 +1243,14 @@ read_device_map (const char *dev_map)
{ {
char *tmp; char *tmp;
tmp = xasprintf (_("missing `%c' symbol"), '('); tmp = xasprintf (_("missing `%c' symbol"), '(');
show_error (tmp); grub_util_error ("%s:%d: %s", dev_map, lineno, tmp);
} }
p++; p++;
/* Find a free slot. */ /* Find a free slot. */
drive = find_free_slot (); drive = find_free_slot ();
if (drive < 0) if (drive < 0)
show_error (_("device count exceeds limit")); grub_util_error ("%s:%d: %s", dev_map, lineno, _("device count exceeds limit"));
e = p; e = p;
p = strchr (p, ')'); p = strchr (p, ')');
@ -1265,7 +1258,7 @@ read_device_map (const char *dev_map)
{ {
char *tmp; char *tmp;
tmp = xasprintf (_("missing `%c' symbol"), ')'); tmp = xasprintf (_("missing `%c' symbol"), ')');
show_error (tmp); grub_util_error ("%s:%d: %s", dev_map, lineno, tmp);
} }
map[drive].drive = 0; map[drive].drive = 0;
@ -1310,7 +1303,7 @@ read_device_map (const char *dev_map)
p++; p++;
if (*p == '\0') if (*p == '\0')
show_error (_("filename expected")); grub_util_error ("%s:%d: %s", dev_map, lineno, _("filename expected"));
/* NUL-terminate the filename. */ /* NUL-terminate the filename. */
e = p; e = p;