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
|
@ -57,7 +57,7 @@ read_fs_list (void)
|
|||
{
|
||||
char *filename;
|
||||
|
||||
filename = grub_asprintf ("%s/fs.lst", prefix);
|
||||
filename = grub_xasprintf ("%s/fs.lst", prefix);
|
||||
if (filename)
|
||||
{
|
||||
grub_file_t file;
|
||||
|
|
|
@ -107,7 +107,7 @@ iterate_partition (grub_disk_t disk, const grub_partition_t p)
|
|||
if (! partition_name)
|
||||
return 1;
|
||||
|
||||
name = grub_asprintf ("%s,%s", disk_name, partition_name);
|
||||
name = grub_xasprintf ("%s,%s", disk_name, partition_name);
|
||||
grub_free (partition_name);
|
||||
|
||||
if (! name)
|
||||
|
@ -138,7 +138,7 @@ iterate_dir (const char *filename, const struct grub_dirhook_info *info)
|
|||
{
|
||||
char *fname;
|
||||
|
||||
fname = grub_asprintf ("%s/", filename);
|
||||
fname = grub_xasprintf ("%s/", filename);
|
||||
if (add_completion (fname, "", GRUB_COMPLETION_TYPE_FILE))
|
||||
{
|
||||
grub_free (fname);
|
||||
|
@ -359,7 +359,7 @@ complete_arguments (char *command)
|
|||
if (!option->longarg)
|
||||
continue;
|
||||
|
||||
longarg = grub_asprintf ("--%s", option->longarg);
|
||||
longarg = grub_xasprintf ("--%s", option->longarg);
|
||||
if (!longarg)
|
||||
return 1;
|
||||
|
||||
|
|
|
@ -80,7 +80,7 @@ read_crypto_list (void)
|
|||
return;
|
||||
}
|
||||
|
||||
filename = grub_asprintf ("%s/crypto.lst", prefix);
|
||||
filename = grub_xasprintf ("%s/crypto.lst", prefix);
|
||||
if (!filename)
|
||||
{
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
|
|
|
@ -69,7 +69,7 @@ read_command_list (void)
|
|||
{
|
||||
char *filename;
|
||||
|
||||
filename = grub_asprintf ("%s/command.lst", prefix);
|
||||
filename = grub_xasprintf ("%s/command.lst", prefix);
|
||||
if (filename)
|
||||
{
|
||||
grub_file_t file;
|
||||
|
|
|
@ -172,7 +172,7 @@ read_handler_list (void)
|
|||
{
|
||||
char *filename;
|
||||
|
||||
filename = grub_asprintf ("%s/handler.lst", prefix);
|
||||
filename = grub_xasprintf ("%s/handler.lst", prefix);
|
||||
if (filename)
|
||||
{
|
||||
grub_file_t file;
|
||||
|
|
|
@ -412,7 +412,7 @@ grub_normal_init_page (struct grub_term_output *term)
|
|||
|
||||
grub_term_cls (term);
|
||||
|
||||
msg_formatted = grub_asprintf (msg, PACKAGE_VERSION);
|
||||
msg_formatted = grub_xasprintf (msg, PACKAGE_VERSION);
|
||||
if (!msg_formatted)
|
||||
return;
|
||||
|
||||
|
@ -502,7 +502,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
|||
prefix = grub_env_get ("prefix");
|
||||
if (prefix)
|
||||
{
|
||||
config = grub_asprintf ("%s/grub.cfg", prefix);
|
||||
config = grub_xasprintf ("%s/grub.cfg", prefix);
|
||||
if (! config)
|
||||
goto quit;
|
||||
|
||||
|
@ -541,7 +541,7 @@ grub_normal_reader_init (int nested)
|
|||
const char *msg_esc = _("ESC at any time exits.");
|
||||
char *msg_formatted;
|
||||
|
||||
msg_formatted = grub_asprintf (msg, nested ? msg_esc : "");
|
||||
msg_formatted = grub_xasprintf (msg, nested ? msg_esc : "");
|
||||
if (!msg_formatted)
|
||||
return grub_errno;
|
||||
|
||||
|
@ -566,9 +566,9 @@ grub_normal_read_line_real (char **line, int cont, int nested)
|
|||
char *prompt;
|
||||
|
||||
if (cont)
|
||||
prompt = grub_asprintf (">");
|
||||
prompt = grub_xasprintf (">");
|
||||
else
|
||||
prompt = grub_asprintf ("%s>", parser->name);
|
||||
prompt = grub_xasprintf ("%s>", parser->name);
|
||||
|
||||
if (!prompt)
|
||||
return grub_errno;
|
||||
|
|
|
@ -187,7 +187,7 @@ command-line or ESC to return menu."), STANDARD_MARGIN, STANDARD_MARGIN,
|
|||
"entry is highlighted.\n");
|
||||
char *msg_translated;
|
||||
|
||||
msg_translated = grub_asprintf (msg, (grub_uint32_t) GRUB_TERM_DISP_UP,
|
||||
msg_translated = grub_xasprintf (msg, (grub_uint32_t) GRUB_TERM_DISP_UP,
|
||||
(grub_uint32_t) GRUB_TERM_DISP_DOWN);
|
||||
if (!msg_translated)
|
||||
return;
|
||||
|
@ -367,7 +367,7 @@ menu_text_print_timeout (int timeout, void *dataptr)
|
|||
|
||||
grub_term_gotoxy (data->term, 0, grub_term_height (data->term) - 3);
|
||||
|
||||
msg_translated = grub_asprintf (msg, timeout);
|
||||
msg_translated = grub_xasprintf (msg, timeout);
|
||||
if (!msg_translated)
|
||||
{
|
||||
grub_print_error ();
|
||||
|
|
|
@ -167,7 +167,7 @@ read_terminal_list (void)
|
|||
return;
|
||||
}
|
||||
|
||||
filename = grub_asprintf ("%s/terminal.lst", prefix);
|
||||
filename = grub_xasprintf ("%s/terminal.lst", prefix);
|
||||
if (!filename)
|
||||
{
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue