aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElyes Haouas <ehaouas@noos.fr>2022-03-04 07:42:09 +0100
committerDaniel Kiper <daniel.kiper@oracle.com>2022-03-14 15:59:07 +0100
commit8cd33b300a437c03253de39fd1de352bd9ffbcd4 (patch)
tree089307670c98d851c5d496ec3c0ec0d893ebf2cf
parent55e237b57dfd44fe5d294f23f82b5a0dece1a1cf (diff)
downloadgrub-8cd33b300a437c03253de39fd1de352bd9ffbcd4.tar.gz
partmap: Remove trailing whitespaces
Signed-off-by: Elyes Haouas <ehaouas@noos.fr> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-rw-r--r--grub-core/partmap/bsdlabel.c4
-rw-r--r--grub-core/partmap/dvh.c4
-rw-r--r--grub-core/partmap/msdos.c4
-rw-r--r--grub-core/partmap/sun.c2
-rw-r--r--grub-core/partmap/sunpc.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/grub-core/partmap/bsdlabel.c b/grub-core/partmap/bsdlabel.c
index 1d785906b..4e93faf1c 100644
--- a/grub-core/partmap/bsdlabel.c
+++ b/grub-core/partmap/bsdlabel.c
@@ -132,14 +132,14 @@ bsdlabel_partition_map_iterate (grub_disk_t disk,
return iterate_real (disk, GRUB_PC_PARTITION_BSD_LABEL_SECTOR, 1,
&grub_bsdlabel_partition_map, hook, hook_data);
- if (disk->partition
+ if (disk->partition
&& (grub_strcmp (disk->partition->partmap->name, "msdos") == 0
|| disk->partition->partmap == &grub_bsdlabel_partition_map
|| disk->partition->partmap == &grub_netbsdlabel_partition_map
|| disk->partition->partmap == &grub_openbsdlabel_partition_map))
return grub_error (GRUB_ERR_BAD_PART_TABLE, "no embedding supported");
- return iterate_real (disk, GRUB_PC_PARTITION_BSD_LABEL_SECTOR, 0,
+ return iterate_real (disk, GRUB_PC_PARTITION_BSD_LABEL_SECTOR, 0,
&grub_bsdlabel_partition_map, hook, hook_data);
}
diff --git a/grub-core/partmap/dvh.c b/grub-core/partmap/dvh.c
index 95c96186c..b25ae0d3b 100644
--- a/grub-core/partmap/dvh.c
+++ b/grub-core/partmap/dvh.c
@@ -33,7 +33,7 @@ struct grub_dvh_partition_descriptor
{
grub_uint32_t length;
grub_uint32_t start;
- grub_uint32_t type;
+ grub_uint32_t type;
} GRUB_PACKED;
struct grub_dvh_block
@@ -86,7 +86,7 @@ dvh_partition_map_iterate (grub_disk_t disk,
if (! grub_dvh_is_valid (block.raw))
return grub_error (GRUB_ERR_BAD_PART_TABLE, "invalid checksum");
-
+
/* Maybe another error value would be better, because partition
table _is_ recognized but invalid. */
for (partnum = 0; partnum < ARRAY_SIZE (block.dvh.parts); partnum++)
diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c
index 58c3626c6..c85bb74be 100644
--- a/grub-core/partmap/msdos.c
+++ b/grub-core/partmap/msdos.c
@@ -55,7 +55,7 @@ const char message_warn[][200] = {
" avoiding it. "
"This software may cause boot or other problems in "
"future. Please ask its authors not to store data "
- "in the boot track")
+ "in the boot track")
};
@@ -312,7 +312,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
if (grub_msdos_partition_is_extended (e->type))
{
- offset = ext_offset
+ offset = ext_offset
+ ((grub_disk_addr_t)grub_le_to_cpu32 (e->start)
<< (disk->log_sector_size - GRUB_DISK_SECTOR_BITS));
if (! ext_offset)
diff --git a/grub-core/partmap/sun.c b/grub-core/partmap/sun.c
index aac30a320..12bf5ba29 100644
--- a/grub-core/partmap/sun.c
+++ b/grub-core/partmap/sun.c
@@ -108,7 +108,7 @@ sun_partition_map_iterate (grub_disk_t disk,
if (! grub_sun_is_valid (block.raw))
return grub_error (GRUB_ERR_BAD_PART_TABLE, "invalid checksum");
-
+
/* Maybe another error value would be better, because partition
table _is_ recognized but invalid. */
for (partnum = 0; partnum < GRUB_PARTMAP_SUN_MAX_PARTS; partnum++)
diff --git a/grub-core/partmap/sunpc.c b/grub-core/partmap/sunpc.c
index 73a430c14..fe9552e21 100644
--- a/grub-core/partmap/sunpc.c
+++ b/grub-core/partmap/sunpc.c
@@ -91,11 +91,11 @@ sun_pc_partition_map_iterate (grub_disk_t disk,
grub_free (p);
return err;
}
-
+
if (GRUB_PARTMAP_SUN_PC_MAGIC != grub_le_to_cpu16 (block.sun_block.magic))
{
grub_free (p);
- return grub_error (GRUB_ERR_BAD_PART_TABLE,
+ return grub_error (GRUB_ERR_BAD_PART_TABLE,
"not a sun_pc partition table");
}