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

Remove nested functions from device iterators.

Browse source 
* include/grub/arc/arc.h (grub_arc_iterate_devs_hook_t): New type.
(grub_arc_iterate_devs): Add hook_data argument.
* include/grub/ata.h (grub_ata_dev_iterate_hook_t): New type.
(struct grub_ata_dev.iterate): Add hook_data argument.
* include/grub/device.h (grub_device_iterate_hook_t): New type.
(grub_device_iterate): Add hook_data argument.
* include/grub/disk.h (grub_disk_dev_iterate_hook_t): New type.
(struct grub_disk_dev.iterate): Add hook_data argument.
(grub_disk_dev_iterate): Likewise.
* include/grub/gpt_partition.h (grub_gpt_partition_map_iterate):
Likewise.
* include/grub/msdos_partition.h (grub_partition_msdos_iterate):
Likewise.
* include/grub/partition.h (grub_partition_iterate_hook_t): New
type.
(struct grub_partition_map.iterate): Add hook_data argument.
(grub_partition_iterate): Likewise.
* include/grub/scsi.h (grub_scsi_dev_iterate_hook_t): New type.
(struct grub_scsi_dev.iterate): Add hook_data argument.

Update all callers.
This commit is contained in:
Colin Watson 2013-01-20 15:52:15 +00:00
parent 6c0314d638
commit 25239370fd
50 changed files with 1455 additions and 1165 deletions
Download patch file Download diff file Expand all files Collapse all files

11
grub-core/normal/completion.c
View file

@ -99,7 +99,8 @@ add_completion (const char *completion, const char *extra,
}
static int
iterate_partition (grub_disk_t disk, const grub_partition_t p)
iterate_partition (grub_disk_t disk, const grub_partition_t p,
void *data __attribute__ ((unused)))
{
const char *disk_name = disk->name;
char *name;
@ -154,7 +155,7 @@ iterate_dir (const char *filename, const struct grub_dirhook_info *info)
}
static int
iterate_dev (const char *devname)
iterate_dev (const char *devname, void *data __attribute__ ((unused)))
{
grub_device_t dev;
@ -180,7 +181,7 @@ iterate_dev (const char *devname)
}
if (dev->disk)
if (grub_partition_iterate (dev->disk, iterate_partition))
if (grub_partition_iterate (dev->disk, iterate_partition, NULL))
{
grub_device_close (dev);
return 1;
@ -213,7 +214,7 @@ complete_device (void)
if (! p)
{
/* Complete the disk part. */
if (grub_disk_dev_iterate (iterate_dev))
if (grub_disk_dev_iterate (iterate_dev, NULL))
return 1;
}
else
@ -228,7 +229,7 @@ complete_device (void)
{
if (dev->disk)
{
if (grub_partition_iterate (dev->disk, iterate_partition))
if (grub_partition_iterate (dev->disk, iterate_partition, NULL))
{
grub_device_close (dev);
return 1;