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

Rename asprint into xasprintf and avsprintf into xvasprintf

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-20 09:12:47 +01:00
parent adb893f2ae
commit 61eb45eee7
55 changed files with 79 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kern/device.c
View file

@ -146,7 +146,7 @@ grub_device_iterate (int (*hook) (const char *name))
return 1;
}
p->name = grub_asprintf ("%s,%s", disk->name, partition_name);
p->name = grub_xasprintf ("%s,%s", disk->name, partition_name);
if (!p->name)
{
grub_free (partition_name);

2
kern/dl.c
View file

@ -627,7 +627,7 @@ grub_dl_load (const char *name)
return 0;
}
filename = grub_asprintf ("%s/%s.mod", grub_dl_dir, name);
filename = grub_xasprintf ("%s/%s.mod", grub_dl_dir, name);
if (! filename)
return 0;

2
kern/efi/init.c
View file

@ -63,7 +63,7 @@ grub_efi_set_prefix (void)
if (p)
*p = '\0';
prefix = grub_asprintf ("(%s)%s", device, file);
prefix = grub_xasprintf ("(%s)%s", device, file);
if (prefix)
{

2
kern/env.c
View file

@ -357,7 +357,7 @@ grub_register_variable_hook (const char *name,
static char *
mangle_data_slot_name (const char *name)
{
return grub_asprintf ("\e%s", name);
return grub_xasprintf ("\e%s", name);
}
grub_err_t

2
kern/ieee1275/init.c
View file

@ -111,7 +111,7 @@ grub_machine_set_prefix (void)
*lastslash = '\0';
grub_translate_ieee1275_path (filename);
newprefix = grub_asprintf ("%s%s", prefix, filename);
newprefix = grub_xasprintf ("%s%s", prefix, filename);
if (newprefix)
{
grub_free (prefix);

8
kern/ieee1275/openfw.c
View file

@ -82,7 +82,7 @@ grub_children_iterate (char *devpath,
IEEE1275_MAX_PROP_LEN, &actual))
continue;
fullname = grub_asprintf ("%s/%s", devpath, childname);
fullname = grub_xasprintf ("%s/%s", devpath, childname);
if (!fullname)
{
grub_free (childname);
@ -332,7 +332,7 @@ grub_ieee1275_parse_args (const char *path, enum grub_ieee1275_parse_type ptype)
/* Make sure filepath has leading backslash. */
if (filepath[0] != '\\')
ret = grub_asprintf ("\\%s", filepath);
ret = grub_xasprintf ("\\%s", filepath);
else
ret = grub_strdup (filepath);
}
@ -382,10 +382,10 @@ grub_ieee1275_encode_devname (const char *path)
/* GRUB partition 1 is OF partition 0. */
partno++;
encoding = grub_asprintf ("(%s,%d)", device, partno);
encoding = grub_xasprintf ("(%s,%d)", device, partno);
}
else
encoding = grub_asprintf ("(%s)", device);
encoding = grub_xasprintf ("(%s)", device);
grub_free (partition);
grub_free (device);

6
kern/misc.c
View file

@ -913,7 +913,7 @@ grub_snprintf (char *str, grub_size_t n, const char *fmt, ...)
#define PREALLOC_SIZE 255
char *
grub_avsprintf (const char *fmt, va_list ap)
grub_xvasprintf (const char *fmt, va_list ap)
{
grub_size_t s, as = PREALLOC_SIZE;
char *ret;
@ -934,13 +934,13 @@ grub_avsprintf (const char *fmt, va_list ap)
}
char *
grub_asprintf (const char *fmt, ...)
grub_xasprintf (const char *fmt, ...)
{
va_list ap;
char *ret;
va_start (ap, fmt);
ret = grub_avsprintf (fmt, ap);
ret = grub_xvasprintf (fmt, ap);
va_end (ap);
return ret;

2
kern/sparc64/ieee1275/init.c
View file

@ -90,7 +90,7 @@ grub_machine_set_prefix (void)
}
prefix = grub_ieee1275_encode_devname (bootpath);
path = grub_asprintf("%s%s", prefix, grub_prefix);
path = grub_xasprintf("%s%s", prefix, grub_prefix);
grub_strcpy (grub_prefix, path);