mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-25 08:39:28 +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
@@ -85,7 +85,7 @@ acorn_partition_map_find (grub_disk_t disk, struct linux_part *m,
|
||||
|
||||
fail:
|
||||
return grub_error (GRUB_ERR_BAD_PART_TABLE,
|
||||
"Linux/ADFS partition map not found.");
|
||||
"Linux/ADFS partition map not found");
|
||||
|
||||
}
|
||||
|
||||
@@ -175,14 +175,7 @@ fail:
|
||||
static char *
|
||||
acorn_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