merge mainline into emu-mod

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

View file

@ -162,14 +162,7 @@ gpt_partition_map_probe (grub_disk_t disk, const char *str)
static char *
gpt_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);
}