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

* grub-core/partmap/gpt.c (gpt_partition_map_embed): Rename disk to

Browse source 
disk_ to avoid shadowing.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-10 12:24:03 +01:00
parent 340ba63ede
commit 44d10dada6
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/LzFind.c (MatchFinder_GetIndexByte): Rename index to * grub-core/lib/LzFind.c (MatchFinder_GetIndexByte): Rename index to

4
grub-core/partmap/gpt.c
View file

@ -127,7 +127,7 @@ grub_gpt_partition_map_iterate (grub_disk_t disk,
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
static grub_err_t 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_embed_type_t embed_type,
grub_disk_addr_t **sectors) 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, return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
"GPT currently supports only PC-BIOS embedding"); "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) if (err)
return err; return err;