core/partmap: rename 'sun' to avoid clash with predefined symbol
the symbol “sun” is defined macro in solaris derived systems, from gcc -dM -E: and therefore can not be used as name.
This commit is contained in:
parent
e97f5f4968
commit
5b5d8666a7
|
@ -91,7 +91,7 @@ sun_partition_map_iterate (grub_disk_t disk,
|
||||||
struct grub_partition p;
|
struct grub_partition p;
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
struct grub_sun_block sun;
|
struct grub_sun_block sun_block;
|
||||||
grub_uint16_t raw[0];
|
grub_uint16_t raw[0];
|
||||||
} block;
|
} block;
|
||||||
int partnum;
|
int partnum;
|
||||||
|
@ -103,7 +103,7 @@ sun_partition_map_iterate (grub_disk_t disk,
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
if (GRUB_PARTMAP_SUN_MAGIC != grub_be_to_cpu16 (block.sun.magic))
|
if (GRUB_PARTMAP_SUN_MAGIC != grub_be_to_cpu16 (block.sun_block.magic))
|
||||||
return grub_error (GRUB_ERR_BAD_PART_TABLE, "not a sun partition table");
|
return grub_error (GRUB_ERR_BAD_PART_TABLE, "not a sun partition table");
|
||||||
|
|
||||||
if (! grub_sun_is_valid (block.raw))
|
if (! grub_sun_is_valid (block.raw))
|
||||||
|
@ -115,14 +115,14 @@ sun_partition_map_iterate (grub_disk_t disk,
|
||||||
{
|
{
|
||||||
struct grub_sun_partition_descriptor *desc;
|
struct grub_sun_partition_descriptor *desc;
|
||||||
|
|
||||||
if (block.sun.infos[partnum].id == 0
|
if (block.sun_block.infos[partnum].id == 0
|
||||||
|| block.sun.infos[partnum].id == GRUB_PARTMAP_SUN_WHOLE_DISK_ID)
|
|| block.sun_block.infos[partnum].id == GRUB_PARTMAP_SUN_WHOLE_DISK_ID)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
desc = &block.sun.partitions[partnum];
|
desc = &block.sun_block.partitions[partnum];
|
||||||
p.start = ((grub_uint64_t) grub_be_to_cpu32 (desc->start_cylinder)
|
p.start = ((grub_uint64_t) grub_be_to_cpu32 (desc->start_cylinder)
|
||||||
* grub_be_to_cpu16 (block.sun.ntrks)
|
* grub_be_to_cpu16 (block.sun_block.ntrks)
|
||||||
* grub_be_to_cpu16 (block.sun.nsect));
|
* grub_be_to_cpu16 (block.sun_block.nsect));
|
||||||
p.len = grub_be_to_cpu32 (desc->num_sectors);
|
p.len = grub_be_to_cpu32 (desc->num_sectors);
|
||||||
p.number = p.index = partnum;
|
p.number = p.index = partnum;
|
||||||
if (p.len)
|
if (p.len)
|
||||||
|
|
|
@ -74,7 +74,7 @@ sun_pc_partition_map_iterate (grub_disk_t disk,
|
||||||
grub_partition_t p;
|
grub_partition_t p;
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
struct grub_sun_pc_block sun;
|
struct grub_sun_pc_block sun_block;
|
||||||
grub_uint16_t raw[0];
|
grub_uint16_t raw[0];
|
||||||
} block;
|
} block;
|
||||||
int partnum;
|
int partnum;
|
||||||
|
@ -92,7 +92,7 @@ sun_pc_partition_map_iterate (grub_disk_t disk,
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GRUB_PARTMAP_SUN_PC_MAGIC != grub_le_to_cpu16 (block.sun.magic))
|
if (GRUB_PARTMAP_SUN_PC_MAGIC != grub_le_to_cpu16 (block.sun_block.magic))
|
||||||
{
|
{
|
||||||
grub_free (p);
|
grub_free (p);
|
||||||
return grub_error (GRUB_ERR_BAD_PART_TABLE,
|
return grub_error (GRUB_ERR_BAD_PART_TABLE,
|
||||||
|
@ -111,12 +111,12 @@ sun_pc_partition_map_iterate (grub_disk_t disk,
|
||||||
{
|
{
|
||||||
struct grub_sun_pc_partition_descriptor *desc;
|
struct grub_sun_pc_partition_descriptor *desc;
|
||||||
|
|
||||||
if (block.sun.partitions[partnum].id == 0
|
if (block.sun_block.partitions[partnum].id == 0
|
||||||
|| block.sun.partitions[partnum].id
|
|| block.sun_block.partitions[partnum].id
|
||||||
== GRUB_PARTMAP_SUN_PC_WHOLE_DISK_ID)
|
== GRUB_PARTMAP_SUN_PC_WHOLE_DISK_ID)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
desc = &block.sun.partitions[partnum];
|
desc = &block.sun_block.partitions[partnum];
|
||||||
p->start = grub_le_to_cpu32 (desc->start_sector);
|
p->start = grub_le_to_cpu32 (desc->start_sector);
|
||||||
p->len = grub_le_to_cpu32 (desc->num_sectors);
|
p->len = grub_le_to_cpu32 (desc->num_sectors);
|
||||||
p->number = partnum;
|
p->number = partnum;
|
||||||
|
|
Loading…
Reference in New Issue