Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-25 16:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix shadowed variable bugs and undefined cpp macro bugs.

Browse Source
This commit is contained in:
okuji committed 2000-07-28 16:51:16 +00:00
1 parent ca924e1180
commit 952982deb9
16 files changed
+1192 -1334
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/device.c
+6 -6
View File
@@ -300,7 +300,7 @@ check_device (const char *device)
static int
read_device_map (FILE *fp, char **map, const char *map_file)
{
static void print_error (int no, const char *msg)
static void show_error (int no, const char *msg)
{
fprintf (stderr, "%s:%d: error: %s\n", map_file, no, msg);
}
@@ -330,14 +330,14 @@ read_device_map (FILE *fp, char **map, const char *map_file)
if (*ptr != '(')
{
print_error (line_number, "No open parenthesis found");
show_error (line_number, "No open parenthesis found");
return 0;
}
ptr++;
if ((*ptr != 'f' && *ptr != 'h') || *(ptr + 1) != 'd')
{
print_error (line_number, "Bad drive name");
show_error (line_number, "Bad drive name");
return 0;
}
@@ -348,7 +348,7 @@ read_device_map (FILE *fp, char **map, const char *map_file)
drive = strtoul (ptr, &ptr, 10);
if (drive < 0 || drive > 8)
{
print_error (line_number, "Bad device number");
show_error (line_number, "Bad device number");
return 0;
}
@@ -357,7 +357,7 @@ read_device_map (FILE *fp, char **map, const char *map_file)
if (*ptr != ')')
{
print_error (line_number, "No close parenthesis found");
show_error (line_number, "No close parenthesis found");
return 0;
}
@@ -368,7 +368,7 @@ read_device_map (FILE *fp, char **map, const char *map_file)
if (! *ptr)
{
print_error (line_number, "No filename found");
show_error (line_number, "No filename found");
return 0;
}