fix 3rd argument to scsi_iterate

diff --git a/grub-core/disk/ata.c b/grub-core/disk/ata.c
index 9f62546e13a70f20679f71f4232f2ce0d48176e4..6f7f44227de16e2052d1945af111059cd27488bc 100644 (file)
--- a/grub-core/disk/ata.c
+++ b/grub-core/disk/ata.c
@@ -508,7 +508,7 @@ grub_atapi_open (int id, int bus, struct grub_scsi *scsi)
 }
 
 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);
   int hook (int id, int bus)

diff --git a/grub-core/disk/scsi.c b/grub-core/disk/scsi.c
index b989a98ad1f2ae1c6c7bb7ebaffd74cbfaf8133a..015e5dce6d4485cb5ce59b9f8c4dda505baed75e 100644 (file)
--- a/grub-core/disk/scsi.c
+++ b/grub-core/disk/scsi.c
@@ -324,9 +324,9 @@ grub_scsi_iterate (int (*hook) (const char *name))
 {
   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;
 

diff --git a/grub-core/disk/usbms.c b/grub-core/disk/usbms.c
index 4e1af7be3d09580cbdd435687101642f76585380..8041c6c951a7660b08e8ae376fc6475fd2ead3c5 100644 (file)
--- a/grub-core/disk/usbms.c
+++ b/grub-core/disk/usbms.c
@@ -205,7 +205,7 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)
 \f
 
 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;
 

diff --git a/include/grub/scsi.h b/include/grub/scsi.h
index 3deb18f1bd8c4e22e15ed9b97cb000f1a8e2d0e6..5b6ccc9f4b64a3ca23890b5c78a3ef9ddce385b0 100644 (file)
--- a/include/grub/scsi.h
+++ b/include/grub/scsi.h
@@ -50,7 +50,7 @@ grub_make_scsi_id (int subsystem, int bus, int lun)
 struct grub_scsi_dev
 {
   /* 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.  */
   grub_err_t (*open) (int id, int bus, struct grub_scsi *scsi);