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

2008-06-04 Robert Millan <rmh@aybabtu.com>

Browse source 
* util/biosdisk.c (get_drive): Rename to ...
        (find_grub_drive): ... this.  Update all users.

        (get_os_disk): Rename to ...
        (convert_system_partition_to_system_disk): ... this.  Update all users.

        (find_drive): Rename to ...
        (find_system_device): ... this.  Update all users.
This commit is contained in:
robertmh 2008-06-04 13:59:55 +00:00
parent e6a30859dd
commit 1ad36d3785
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2008-06-04 Robert Millan <rmh@aybabtu.com>
* util/biosdisk.c (get_drive): Rename to ...
(find_grub_drive): ... this. Update all users.
(get_os_disk): Rename to ...
(convert_system_partition_to_system_disk): ... this. Update all users.
(find_drive): Rename to ...
(find_system_device): ... this. Update all users.
2008-06-04 Robert Millan <rmh@aybabtu.com> 2008-06-04 Robert Millan <rmh@aybabtu.com>
* util/biosdisk.c (get_os_disk): Handle IDA devices. * util/biosdisk.c (get_os_disk): Handle IDA devices.

16
util/biosdisk.c
View file

@ -110,7 +110,7 @@ have_devfs (void)
#endif /* __linux__ */ #endif /* __linux__ */
static int static int
get_drive (const char *name) find_grub_drive (const char *name)
{ {
unsigned int i; unsigned int i;
@ -148,7 +148,7 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
int drive; int drive;
struct stat st; struct stat st;
drive = get_drive (name); drive = find_grub_drive (name);
if (drive < 0) if (drive < 0)
return grub_error (GRUB_ERR_BAD_DEVICE, return grub_error (GRUB_ERR_BAD_DEVICE,
"no mapping exists for `%s'", name); "no mapping exists for `%s'", name);
@ -503,7 +503,7 @@ read_device_map (const char *dev_map)
p++; p++;
/* Find a free slot. */ /* Find a free slot. */
drive = get_drive (NULL); drive = find_grub_drive (NULL);
if (drive < 0) if (drive < 0)
show_error ("Map table size exceeded"); show_error ("Map table size exceeded");
@ -593,7 +593,7 @@ make_device_name (int drive, int dos_part, int bsd_part)
} }
static char * static char *
get_os_disk (const char *os_dev) convert_system_partition_to_system_disk (const char *os_dev)
{ {
#if defined(__linux__) #if defined(__linux__)
char *path = xmalloc (PATH_MAX); char *path = xmalloc (PATH_MAX);
@ -707,18 +707,18 @@ get_os_disk (const char *os_dev)
return path; return path;
#else #else
# warning "The function `get_os_disk' might not work on your OS correctly." # warning "The function `convert_system_partition_to_system_disk' might not work on your OS correctly."
return xstrdup (os_dev); return xstrdup (os_dev);
#endif #endif
} }
static int static int
find_drive (const char *os_dev) find_system_device (const char *os_dev)
{ {
int i; int i;
char *os_disk; char *os_disk;
os_disk = get_os_disk (os_dev); os_disk = convert_system_partition_to_system_disk (os_dev);
if (! os_disk) if (! os_disk)
return -1; return -1;
@ -745,7 +745,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
return 0; return 0;
} }
drive = find_drive (os_dev); drive = find_system_device (os_dev);
if (drive < 0) if (drive < 0)
{ {
grub_error (GRUB_ERR_BAD_DEVICE, grub_error (GRUB_ERR_BAD_DEVICE,