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

merge mainline into emu-mod

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-02-07 03:06:33 +01:00
commit 19a9fb834b
459 changed files with 26481 additions and 7640 deletions
Download patch file Download diff file Expand all files Collapse all files

11
partmap/acorn.c
View file

@ -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);
}