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

gpt: add helper for picking a valid header

Browse source 
Eliminate some repetition in primary vs. backup header acquisition.
This commit is contained in:
Vito Caputo 2016-08-25 17:21:18 -07:00 committed by Michael Marineau
parent bf127238ee
commit 92b5bd1ce3
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
grub-core/lib/gpt.c
View file

@ -108,21 +108,32 @@ grub_gpt_part_uuid (grub_device_t device, char **uuid)
return GRUB_ERR_NONE;
}
static struct grub_gpt_header *
grub_gpt_get_header (grub_gpt_t gpt)
{
if (gpt->status & GRUB_GPT_PRIMARY_HEADER_VALID)
return &gpt->primary;
else if (gpt->status & GRUB_GPT_BACKUP_HEADER_VALID)
return &gpt->backup;
grub_error (GRUB_ERR_BUG, "No valid GPT header");
return NULL;
}
grub_err_t
grub_gpt_disk_uuid (grub_device_t device, char **uuid)
{
struct grub_gpt_header *header;
grub_gpt_t gpt = grub_gpt_read (device->disk);
if (!gpt)
goto done;
grub_errno = GRUB_ERR_NONE;
header = grub_gpt_get_header (gpt);
if (!header)
goto done;
if (gpt->status & GRUB_GPT_PRIMARY_HEADER_VALID)
*uuid = grub_gpt_guid_to_str (&gpt->primary.guid);
else if (gpt->status & GRUB_GPT_BACKUP_HEADER_VALID)
*uuid = grub_gpt_guid_to_str (&gpt->backup.guid);
else
grub_errno = grub_error (GRUB_ERR_BUG, "No valid GPT header");
*uuid = grub_gpt_guid_to_str (&header->guid);
done:
grub_gpt_free (gpt);
@ -552,11 +563,8 @@ grub_gpt_get_partentry (grub_gpt_t gpt, grub_uint32_t n)
struct grub_gpt_header *header;
grub_size_t offset;
if (gpt->status & GRUB_GPT_PRIMARY_HEADER_VALID)
header = &gpt->primary;
else if (gpt->status & GRUB_GPT_BACKUP_HEADER_VALID)
header = &gpt->backup;
else
header = grub_gpt_get_header (gpt);
if (!header)
return NULL;
if (n >= grub_le_to_cpu32 (header->maxpart))