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

fix 3rd argument to scsi_iterate

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-12-24 17:09:56 +01:00
parent faec81d97d
commit 22a7cc9a6f
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/disk/ata.c
View file

@ -508,7 +508,7 @@ grub_atapi_open (int id, int bus, struct grub_scsi *scsi)
} }
static int static int
grub_atapi_iterate (int (*hook_in) (int id, int bus, int luns)) grub_atapi_iterate (int NESTED_FUNC_ATTR (*hook_in) (int id, int bus, int luns))
{ {
auto int hook (int id, int bus); auto int hook (int id, int bus);
int hook (int id, int bus) int hook (int id, int bus)

4
grub-core/disk/scsi.c
View file

@ -324,9 +324,9 @@ grub_scsi_iterate (int (*hook) (const char *name))
{ {
grub_scsi_dev_t p; grub_scsi_dev_t p;
auto int scsi_iterate (int id, int bus, int luns); auto int NESTED_FUNC_ATTR scsi_iterate (int id, int bus, int luns);
int scsi_iterate (int id, int bus, int luns) int NESTED_FUNC_ATTR scsi_iterate (int id, int bus, int luns)
{ {
int i; int i;

2
grub-core/disk/usbms.c
View file

@ -205,7 +205,7 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)
static int static int
grub_usbms_iterate (int (*hook) (int id, int bus, int luns)) grub_usbms_iterate (int NESTED_FUNC_ATTR (*hook) (int id, int bus, int luns))
{ {
unsigned i; unsigned i;

2
include/grub/scsi.h
View file

@ -50,7 +50,7 @@ grub_make_scsi_id (int subsystem, int bus, int lun)
struct grub_scsi_dev struct grub_scsi_dev
{ {
/* Call HOOK with each device name, until HOOK returns non-zero. */ /* Call HOOK with each device name, until HOOK returns non-zero. */
int (*iterate) (int (*hook) (int id, int bus, int luns)); int (*iterate) (int NESTED_FUNC_ATTR (*hook) (int id, int bus, int luns));
/* Open the device named NAME, and set up SCSI. */ /* Open the device named NAME, and set up SCSI. */
grub_err_t (*open) (int id, int bus, struct grub_scsi *scsi); grub_err_t (*open) (int id, int bus, struct grub_scsi *scsi);