From 44d10dada6c46b99b80efc1e2cd2b9f993aa26b0 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 10 Feb 2012 12:24:03 +0100 Subject: [PATCH] * grub-core/partmap/gpt.c (gpt_partition_map_embed): Rename disk to disk_ to avoid shadowing. --- ChangeLog | 5 +++++ grub-core/partmap/gpt.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6d950ca8..90f24c274 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-10 Vladimir Serbinenko + + * grub-core/partmap/gpt.c (gpt_partition_map_embed): Rename disk to + disk_ to avoid shadowing. + 2012-02-10 Vladimir Serbinenko * grub-core/lib/LzFind.c (MatchFinder_GetIndexByte): Rename index to diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c index ef89a902f..db4b5d004 100644 --- a/grub-core/partmap/gpt.c +++ b/grub-core/partmap/gpt.c @@ -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;