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

Remove nested functions from USB iterators.

Browse source 
* include/grub/usb.h (grub_usb_iterate_hook_t): New type.
(grub_usb_controller_iterate_hook_t): Likewise.
(grub_usb_iterate): Add hook_data argument.
(grub_usb_controller_iterate): Likewise.
(struct grub_usb_controller_dev.iterate): Likewise.

Update all implementations and callers.
This commit is contained in:
Colin Watson 2013-01-21 21:02:24 +00:00
parent 18288f17ac
commit 5fdbaed168
9 changed files with 108 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
grub-core/bus/usb/emu/usb.c
View file

@ -88,7 +88,7 @@ grub_usb_poll_devices (void)
int
grub_usb_iterate (int (*hook) (grub_usb_device_t dev))
grub_usb_iterate (grub_usb_iterate_hook_t hook, void *hook_data)
{
int i;
@ -96,7 +96,7 @@ grub_usb_iterate (int (*hook) (grub_usb_device_t dev))
{
if (grub_usb_devs[i])
{
if (hook (grub_usb_devs[i]))
if (hook (grub_usb_devs[i], hook_data))
return 1;
}
}