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/commands/usbtest.c
View file

@ -129,7 +129,7 @@ usb_print_str (const char *description, grub_usb_device_t dev, int idx)
}
static int
usb_iterate (grub_usb_device_t dev)
usb_iterate (grub_usb_device_t dev, void *data __attribute__ ((unused)))
{
struct grub_usb_desc_device *descdev;
int i;
@ -199,7 +199,7 @@ grub_cmd_usbtest (grub_command_t cmd __attribute__ ((unused)),
grub_usb_poll_devices ();
grub_printf ("USB devices:\n\n");
grub_usb_iterate (usb_iterate);
grub_usb_iterate (usb_iterate, NULL);
return 0;
}