mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-25 16:49:23 +00:00
fix 3rd argument to scsi_iterate
This commit is contained in:
1 parent
faec81d97d
commit
22a7cc9a6f
4 files changed
+5
-5
No files matched your search
@@ -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)
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -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);
|
||||||
|
|||||||
Reference in new issue
Block a user