Rename asprint into xasprintf and avsprintf into xvasprintf
This commit is contained in:
parent
adb893f2ae
commit
61eb45eee7
55 changed files with 79 additions and 79 deletions
|
@ -1150,7 +1150,7 @@ grub_cmd_freebsd_loadenv (grub_command_t cmd __attribute__ ((unused)),
|
|||
if (*p == '"')
|
||||
p++;
|
||||
|
||||
name = grub_asprintf ("kFreeBSD.%s", curr);
|
||||
name = grub_xasprintf ("kFreeBSD.%s", curr);
|
||||
if (!name)
|
||||
goto fail;
|
||||
if (grub_env_set (name, p))
|
||||
|
|
|
@ -519,7 +519,7 @@ grub_linux_boot (void)
|
|||
May change in future if we have modes without framebuffer. */
|
||||
if (modevar && *modevar != 0)
|
||||
{
|
||||
tmp = grub_asprintf ("%s;text", modevar);
|
||||
tmp = grub_xasprintf ("%s;text", modevar);
|
||||
if (! tmp)
|
||||
return grub_errno;
|
||||
err = grub_video_set_mode (tmp, 0, 0);
|
||||
|
@ -797,7 +797,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
linux_mode
|
||||
= &linux_vesafb_modes[vid_mode - GRUB_LINUX_VID_MODE_VESA_START];
|
||||
|
||||
buf = grub_asprintf ("%ux%ux%u,%ux%u",
|
||||
buf = grub_xasprintf ("%ux%ux%u,%ux%u",
|
||||
linux_vesafb_res[linux_mode->res_index].width,
|
||||
linux_vesafb_res[linux_mode->res_index].height,
|
||||
linux_mode->depth,
|
||||
|
|
|
@ -252,11 +252,11 @@ grub_multiboot (int argc, char *argv[])
|
|||
{
|
||||
char *buf;
|
||||
if (header->depth && header->width && header->height)
|
||||
buf = grub_asprintf ("%dx%dx%d,%dx%d,auto", header->width,
|
||||
buf = grub_xasprintf ("%dx%dx%d,%dx%d,auto", header->width,
|
||||
header->height, header->depth, header->width,
|
||||
header->height);
|
||||
else if (header->width && header->height)
|
||||
buf = grub_asprintf ("%dx%d,auto", header->width, header->height);
|
||||
buf = grub_xasprintf ("%dx%d,auto", header->width, header->height);
|
||||
else
|
||||
buf = grub_strdup ("auto");
|
||||
|
||||
|
|
|
@ -150,7 +150,7 @@ set_video_mode (void)
|
|||
else
|
||||
{
|
||||
char *tmp;
|
||||
tmp = grub_asprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
|
||||
tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
|
||||
if (! tmp)
|
||||
return grub_errno;
|
||||
err = grub_video_set_mode (tmp, 0, 0);
|
||||
|
|
|
@ -47,7 +47,7 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
|
|||
32 << GRUB_VIDEO_MODE_TYPE_DEPTH_POS);
|
||||
else
|
||||
{
|
||||
tmp = grub_asprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
|
||||
tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
|
||||
if (! tmp)
|
||||
return grub_error (GRUB_ERR_OUT_OF_MEMORY,
|
||||
"couldn't allocate temporary storag");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue