asprintf and snprintf support
This commit is contained in:
parent
c181849b95
commit
8b442f3f4c
60 changed files with 396 additions and 345 deletions
|
@ -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_asprintf ("%d", p->index + 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_asprintf ("%d", p->index + 1);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -227,14 +227,7 @@ apple_partition_map_probe (grub_disk_t disk, const char *str)
|
|||
static char *
|
||||
apple_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_asprintf ("%d", p->index + 1);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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_asprintf ("%d", p->index + 1);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -300,21 +300,15 @@ pc_partition_map_probe (grub_disk_t disk, const char *str)
|
|||
static char *
|
||||
pc_partition_map_get_name (const grub_partition_t p)
|
||||
{
|
||||
char *name;
|
||||
struct grub_msdos_partition *pcdata = p->data;
|
||||
|
||||
name = grub_malloc (13);
|
||||
if (! name)
|
||||
return 0;
|
||||
|
||||
if (pcdata->bsd_part < 0)
|
||||
grub_sprintf (name, "%d", pcdata->dos_part + 1);
|
||||
return grub_asprintf ("%d", pcdata->dos_part + 1);
|
||||
else if (pcdata->dos_part < 0)
|
||||
grub_sprintf (name, "%c", pcdata->bsd_part + 'a');
|
||||
return grub_asprintf ("%c", pcdata->bsd_part + 'a');
|
||||
else
|
||||
grub_sprintf (name, "%d,%c", pcdata->dos_part + 1, pcdata->bsd_part + 'a');
|
||||
|
||||
return name;
|
||||
return grub_asprintf ("%d,%c", pcdata->dos_part + 1,
|
||||
pcdata->bsd_part + 'a');
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -184,13 +184,7 @@ sun_partition_map_probe (grub_disk_t disk, const char *str)
|
|||
static char *
|
||||
sun_partition_map_get_name (const grub_partition_t p)
|
||||
{
|
||||
char *name;
|
||||
|
||||
name = grub_malloc (13);
|
||||
if (name)
|
||||
grub_sprintf (name, "%d", p->index + 1);
|
||||
|
||||
return name;
|
||||
return grub_asprintf ("%d", p->index + 1);
|
||||
}
|
||||
|
||||
/* Partition map type. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue