mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 06:49:35 +00:00
* grub-core/partmap/gpt.c (gpt_partition_map_embed): Rename disk to
disk_ to avoid shadowing.
This commit is contained in:
1 parent
340ba63ede
commit
44d10dada6
2 files changed
+7
-2
No files matched your search
@@ -1,3 +1,8 @@
|
||||
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/partmap/gpt.c (gpt_partition_map_embed): Rename disk to
|
||||
disk_ to avoid shadowing.
|
||||
|
||||
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/lib/LzFind.c (MatchFinder_GetIndexByte): Rename index to
|
||||
|
||||
@@ -127,7 +127,7 @@ grub_gpt_partition_map_iterate (grub_disk_t disk,
|
||||
|
||||
#ifdef GRUB_UTIL
|
||||
static grub_err_t
|
||||
gpt_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
|
||||
gpt_partition_map_embed (struct grub_disk *disk_, unsigned int *nsectors,
|
||||
grub_embed_type_t embed_type,
|
||||
grub_disk_addr_t **sectors)
|
||||
{
|
||||
@@ -168,7 +168,7 @@ gpt_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
|
||||
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
||||
"GPT currently supports only PC-BIOS embedding");
|
||||
|
||||
err = grub_gpt_partition_map_iterate (disk, find_usable_region);
|
||||
err = grub_gpt_partition_map_iterate (disk_, find_usable_region);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
||||
Reference in new issue
Block a user