mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-23 15:49:23 +00:00
merge mainline into emu-mod
This commit is contained in:
commit
19a9fb834b
459 files changed
+26481
-7640
No files matched your search
+2
-9
@@ -102,7 +102,7 @@ amiga_partition_map_iterate (grub_disk_t disk,
|
||||
|
||||
if (next == -1)
|
||||
return grub_error (GRUB_ERR_BAD_PART_TABLE,
|
||||
"Amiga partition map not found.");
|
||||
"Amiga partition map not found");
|
||||
|
||||
/* The end of the partition list is marked using "-1". */
|
||||
while (next != -1)
|
||||
@@ -184,14 +184,7 @@ amiga_partition_map_probe (grub_disk_t disk, const char *str)
|
||||
static char *
|
||||
amiga_partition_map_get_name (const grub_partition_t p)
|
||||
{
|
||||
char *name;
|
||||
|
||||
name = grub_malloc (13);
|
||||
if (! name)
|
||||
return 0;
|
||||
|
||||
grub_sprintf (name, "%d", p->index + 1);
|
||||
return name;
|
||||
return grub_xasprintf ("%d", p->index + 1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user