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

Remove prio_list

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-12 03:52:17 +01:00
parent 78dde88e8c
commit ead2a8822b
7 changed files with 41 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

36
grub-core/kern/command.c
View file

@ -30,6 +30,9 @@ grub_register_command_prio (const char *name,
int prio)
{
grub_command_t cmd;
int inactive = 0;
grub_command_t *p, q;
cmd = (grub_command_t) grub_zalloc (sizeof (*cmd));
if (! cmd)
@ -42,9 +45,34 @@ grub_register_command_prio (const char *name,
cmd->flags = 0;
cmd->prio = prio;
for (p = &grub_command_list, q = *p; q; p = &(q->next), q = q->next)
{
int r;
grub_prio_list_insert (GRUB_AS_PRIO_LIST_P (&grub_command_list),
GRUB_AS_PRIO_LIST (cmd));
r = grub_strcmp (cmd->name, q->name);
if (r < 0)
break;
if (r > 0)
continue;
if (cmd->prio >= (q->prio & GRUB_COMMAND_PRIO_MASK))
{
q->prio &= ~GRUB_COMMAND_FLAG_ACTIVE;
break;
}
inactive = 1;
}
*p = cmd;
cmd->next = q;
if (q)
q->prev = &cmd->next;
cmd->prev = p;
if (! inactive)
cmd->prio |= GRUB_COMMAND_FLAG_ACTIVE;
return cmd;
}
@ -52,6 +80,8 @@ grub_register_command_prio (const char *name,
void
grub_unregister_command (grub_command_t cmd)
{
grub_prio_list_remove (GRUB_AS_PRIO_LIST (cmd));
if ((cmd->prio & GRUB_COMMAND_FLAG_ACTIVE) && (cmd->next))
cmd->next->prio |= GRUB_COMMAND_FLAG_ACTIVE;
grub_list_remove (GRUB_AS_LIST (cmd));
grub_free (cmd);
}