mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-27 09:39:22 +00:00
Remove prio_list.
* include/grub/list.h (grub_prio_list): Removed. (GRUB_PRIO_LIST_PRIO_MASK): Removed. All users switched to GRUB_COMMAND_PRIO_MASK. (GRUB_PRIO_LIST_FLAG_ACTIVE): Removed. All users switched to GRUB_COMMAND_FLAG_ACTIVE. (grub_prio_list_insert): Removed. (grub_prio_list_remove): Likewise. (GRUB_AS_PRIO_LIST): Likewise. (GRUB_AS_PRIO_LIST_P): Likewise. * include/grub/command.h (GRUB_COMMAND_PRIO_MASK): New define. (GRUB_COMMAND_FLAG_ACTIVE): Likewise. * grub-core/kern/list.c (grub_prio_list_insert): Remove. * grub-core/kern/command.c (grub_register_command_prio): Inline the prio_list code. (grub_unregister_command): Likewise.
This commit is contained in:
commit
eece3349ea
8 files changed
+61
-83
No files matched your search
@@ -40,7 +40,7 @@ grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc,
|
||||
grub_command_t cmd;
|
||||
FOR_COMMANDS(cmd)
|
||||
{
|
||||
if ((cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE))
|
||||
if ((cmd->prio & GRUB_COMMAND_FLAG_ACTIVE))
|
||||
{
|
||||
struct grub_term_output *term;
|
||||
const char *summary_translated = _(cmd->summary);
|
||||
@@ -106,7 +106,7 @@ grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc,
|
||||
currarg = args[i];
|
||||
FOR_COMMANDS(cmd_iter)
|
||||
{
|
||||
if (!(cmd_iter->prio & GRUB_PRIO_LIST_FLAG_ACTIVE))
|
||||
if (!(cmd_iter->prio & GRUB_COMMAND_FLAG_ACTIVE))
|
||||
continue;
|
||||
|
||||
if (grub_strncmp (cmd_iter->name, currarg,
|
||||
|
||||
@@ -83,8 +83,8 @@ grub_mini_cmd_help (struct grub_command *cmd __attribute__ ((unused)),
|
||||
|
||||
for (p = grub_command_list; p; p = p->next)
|
||||
grub_printf ("%s (%d%c)\t%s\n", p->name,
|
||||
p->prio & GRUB_PRIO_LIST_PRIO_MASK,
|
||||
(p->prio & GRUB_PRIO_LIST_FLAG_ACTIVE) ? '+' : '-',
|
||||
p->prio & GRUB_COMMAND_PRIO_MASK,
|
||||
(p->prio & GRUB_COMMAND_FLAG_ACTIVE) ? '+' : '-',
|
||||
p->description);
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in new issue
Block a user