2007-08-02 Bean <bean123ch@gmail.com>

	* disk.h (grub_disk): Use NESTED_FUNC_ATTR.

	* file.h (grub_file): Likewise.

	* fshelp.h (grub_fshelp_read_file): Likewise.

	* util/i386/pc/grub-setup.c (setup): Likewise.
	(save_first_sector): Likewise.
	(save_blocklists): Likewise.

	* fs/affs.c (grub_affs_read_file): Likewise.

	* fs/ext2.c (grub_ext2_read_file): Likewise.

	* fs/fat.c (grub_fat_read_data): Likewise.

	* fs/fshelp.c (grub_fshelp_read_file): Likewise.

	* fs/hfs.c (grub_hfs_read_file): Likewise.

	* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.

	* fs/jfs.c (grub_jfs_read_file): Likewise.

	* fs/minix.c (grub_minix_read_file): Likewise.

	* fs/sfs.c (grub_sfs_read_file): Likewise.

	* fs/ufs.c (grub_ufs_read_file): Likewise.

	* fs/xfs.c (grub_xfs_read_file): Likewise.

	* command/blocklist.c (read_blocklist): Likewise.
	(print_blocklist): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 1a68b800cde6bb1574bc51ddf7dd42aa2dc656d5..78113894a1f4fef19d447d9a3e5cad70d8da9f22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2007-08-02  Bean  <bean123ch@gmail.com>
+
+       * disk.h (grub_disk): Use NESTED_FUNC_ATTR.
+
+       * file.h (grub_file): Likewise.
+
+       * fshelp.h (grub_fshelp_read_file): Likewise.
+
+       * util/i386/pc/grub-setup.c (setup): Likewise.
+       (save_first_sector): Likewise.
+       (save_blocklists): Likewise.
+       
+       * fs/affs.c (grub_affs_read_file): Likewise.
+
+       * fs/ext2.c (grub_ext2_read_file): Likewise.
+
+       * fs/fat.c (grub_fat_read_data): Likewise.
+
+       * fs/fshelp.c (grub_fshelp_read_file): Likewise.
+
+       * fs/hfs.c (grub_hfs_read_file): Likewise.
+
+       * fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
+
+       * fs/jfs.c (grub_jfs_read_file): Likewise.
+
+       * fs/minix.c (grub_minix_read_file): Likewise.
+
+       * fs/sfs.c (grub_sfs_read_file): Likewise.
+
+       * fs/ufs.c (grub_ufs_read_file): Likewise.
+       
+       * fs/xfs.c (grub_xfs_read_file): Likewise.
+
+       * command/blocklist.c (read_blocklist): Likewise.
+       (print_blocklist): Likewise.
+
 2007-08-02  Marco Gerards  <marco@gnu.org>
 
        * conf/i386-pc.rmk (grub_emu_SOURCES): Add `disk/host.c' and

diff --git a/commands/blocklist.c b/commands/blocklist.c
index cac83098e4ffb0266ffead4285731e6e0f49076d..df0e63227bc17c79e545fa82410c1e6c3295bb61 100644 (file)
--- a/commands/blocklist.c
+++ b/commands/blocklist.c
@@ -36,12 +36,12 @@ grub_cmd_blocklist (struct grub_arg_list *state __attribute__ ((unused)),
   unsigned num_sectors = 0;
   int num_entries = 0;
   grub_disk_addr_t part_start = 0;
-  auto void read_blocklist (grub_disk_addr_t sector, unsigned offset,
+  auto void NESTED_FUNC_ATTR read_blocklist (grub_disk_addr_t sector, unsigned offset,
                            unsigned length);
-  auto void print_blocklist (grub_disk_addr_t sector, unsigned num,
+  auto void NESTED_FUNC_ATTR print_blocklist (grub_disk_addr_t sector, unsigned num,
                             unsigned offset, unsigned length);
   
-  void read_blocklist (grub_disk_addr_t sector, unsigned offset,
+  void NESTED_FUNC_ATTR read_blocklist (grub_disk_addr_t sector, unsigned offset,
                       unsigned length)
     {
       if (num_sectors > 0)
@@ -66,7 +66,7 @@ grub_cmd_blocklist (struct grub_arg_list *state __attribute__ ((unused)),
        print_blocklist (sector, 0, offset, length);
     }
   
-  void print_blocklist (grub_disk_addr_t sector, unsigned num,
+  void NESTED_FUNC_ATTR print_blocklist (grub_disk_addr_t sector, unsigned num,
                        unsigned offset, unsigned length)
     {
       if (num_entries++)

diff --git a/fs/affs.c b/fs/affs.c
index e19f878c3efee3b88010ddbf707ad4b41e289201..8ebfa4035b90e651986ceda16250bf312654de3a 100644 (file)
--- a/fs/affs.c
+++ b/fs/affs.c
@@ -149,7 +149,7 @@ grub_affs_read_block (grub_fshelp_node_t node, int fileblock)
    POS.  Return the amount of read bytes in READ.  */
 static grub_ssize_t
 grub_affs_read_file (grub_fshelp_node_t node,
-                    void (*read_hook) (grub_disk_addr_t sector,
+                    void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                        unsigned offset, unsigned length),
                     int pos, grub_size_t len, char *buf)
 {

diff --git a/fs/ext2.c b/fs/ext2.c
index 03f6b151fe42ec553862da871840c2f228acc836..1aeaa9481ec4f3f45dc4a1e26faefdabb8b7974c 100644 (file)
--- a/fs/ext2.c
+++ b/fs/ext2.c
@@ -267,7 +267,7 @@ grub_ext2_read_block (grub_fshelp_node_t node, int fileblock)
    POS.  Return the amount of read bytes in READ.  */
 static grub_ssize_t
 grub_ext2_read_file (grub_fshelp_node_t node,
-                    void (*read_hook) (grub_disk_addr_t sector,
+                    void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                        unsigned offset, unsigned length),
                     int pos, grub_size_t len, char *buf)
 {

diff --git a/fs/fat.c b/fs/fat.c
index ebb2d2435f448919504af644c2d66e40aab01d07..7f4107735b0f7f3b469cb585d027656c7a8f5e55 100644 (file)
--- a/fs/fat.c
+++ b/fs/fat.c
@@ -309,7 +309,7 @@ grub_fat_mount (grub_disk_t disk)
 
 static grub_ssize_t
 grub_fat_read_data (grub_disk_t disk, struct grub_fat_data *data,
-                   void (*read_hook) (grub_disk_addr_t sector,
+                   void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                       unsigned offset, unsigned length),
                    grub_off_t offset, grub_size_t len, char *buf)
 {

diff --git a/fs/fshelp.c b/fs/fshelp.c
index a237fae6aa614ccf9613f910e9574e4cb15b6052..ba97a2fdb77ed3402dab1b1fe85fa54e0945075f 100644 (file)
--- a/fs/fshelp.c
+++ b/fs/fshelp.c
@@ -222,7 +222,7 @@ grub_fshelp_find_file (const char *path, grub_fshelp_node_t rootnode,
    blocks have a size of LOG2BLOCKSIZE (in log2).  */
 grub_ssize_t
 grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node,
-                      void (*read_hook) (grub_disk_addr_t sector,
+                      void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                          unsigned offset, unsigned length),
                       int pos, grub_size_t len, char *buf,
                       int (*get_block) (grub_fshelp_node_t node, int block),

diff --git a/fs/hfs.c b/fs/hfs.c
index 5c89bd80c2b668c4a1eea24cba8ae3ec9f16e1d6..be129b4cd56fa3abbff3acf303167b4930e26f7a 100644 (file)
--- a/fs/hfs.c
+++ b/fs/hfs.c
@@ -228,7 +228,7 @@ grub_hfs_block (struct grub_hfs_data *data, grub_hfs_datarecord_t dat,
    POS.  Return the amount of read bytes in READ.  */
 static grub_ssize_t
 grub_hfs_read_file (struct grub_hfs_data *data,
-                   void (*read_hook) (grub_disk_addr_t sector,
+                   void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                       unsigned offset, unsigned length),
                     int pos, grub_size_t len, char *buf)
 {

diff --git a/fs/hfsplus.c b/fs/hfsplus.c
index d771ae3019c84caf84271bc696ba4155cde7b37c..c3e57a4ca34a7741b2e918b51db8f6d32a4ba053 100644 (file)
--- a/fs/hfsplus.c
+++ b/fs/hfsplus.c
@@ -356,7 +356,7 @@ grub_hfsplus_read_block (grub_fshelp_node_t node, int fileblock)
    POS.  Return the amount of read bytes in READ.  */
 static grub_ssize_t
 grub_hfsplus_read_file (grub_fshelp_node_t node,
-                       void (*read_hook) (grub_disk_addr_t sector,
+                       void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                           unsigned offset, unsigned length),
                        int pos, grub_size_t len, char *buf)
 {

diff --git a/fs/jfs.c b/fs/jfs.c
index deb460f52e86b0e5a04280172ab8597ff530bc04..be489b9b2e992df04c76187eef8c1ccf8035fe36 100644 (file)
--- a/fs/jfs.c
+++ b/fs/jfs.c
@@ -539,7 +539,7 @@ grub_jfs_getent (struct grub_jfs_diropen *diro)
    POS.  Return the amount of read bytes in READ.  */
 static grub_ssize_t
 grub_jfs_read_file (struct grub_jfs_data *data,
-                   void (*read_hook) (grub_disk_addr_t sector,
+                   void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                       unsigned offset, unsigned length),
                    int pos, grub_size_t len, char *buf)
 {

diff --git a/fs/minix.c b/fs/minix.c
index 20503e2b0c395544d598940f1dc7e0aa3a460cc8..e78863e277223d7e3a81d300fb6190865d0a0519 100644 (file)
--- a/fs/minix.c
+++ b/fs/minix.c
@@ -186,7 +186,7 @@ grub_minix_get_file_block (struct grub_minix_data *data, unsigned int blk)
    POS.  Return the amount of read bytes in READ.  */
 static grub_ssize_t
 grub_minix_read_file (struct grub_minix_data *data,
-                     void (*read_hook) (grub_disk_addr_t sector,
+                     void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                         unsigned offset, unsigned length),
                      int pos, grub_disk_addr_t len, char *buf)
 {

diff --git a/fs/sfs.c b/fs/sfs.c
index 79de60e7aa6d65f328168277bae5d8f03cb44719..a453bc69cc409e32044dbc6bdf423e7581bdedc8 100644 (file)
--- a/fs/sfs.c
+++ b/fs/sfs.c
@@ -258,7 +258,7 @@ grub_sfs_read_block (grub_fshelp_node_t node, int fileblock)
    POS.  Return the amount of read bytes in READ.  */
 static grub_ssize_t
 grub_sfs_read_file (grub_fshelp_node_t node,
-                   void (*read_hook) (grub_disk_addr_t sector,
+                   void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                       unsigned offset, unsigned length),
                    int pos, grub_size_t len, char *buf)
 {

diff --git a/fs/ufs.c b/fs/ufs.c
index 477b2799a6b573a9b2fc7a19c96ce52aa2c9f188..ba7bfb03f7de94073f2cb06da75435a1c225c18b 100644 (file)
--- a/fs/ufs.c
+++ b/fs/ufs.c
@@ -240,7 +240,7 @@ grub_ufs_get_file_block (struct grub_ufs_data *data, unsigned int blk)
    POS.  Return the amount of read bytes in READ.  */
 static grub_ssize_t
 grub_ufs_read_file (struct grub_ufs_data *data,
-                   void (*read_hook) (grub_disk_addr_t sector,
+                   void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                       unsigned offset, unsigned length),
                    int pos, grub_size_t len, char *buf)
 {

diff --git a/fs/xfs.c b/fs/xfs.c
index e7b529368f416d5b584329ddc3b0355e0a6d3994..b3154c7ceb48d1303d44f2df510927aabb712521 100644 (file)
--- a/fs/xfs.c
+++ b/fs/xfs.c
@@ -236,7 +236,7 @@ grub_xfs_read_block (grub_fshelp_node_t node, int fileblock)
    POS.  Return the amount of read bytes in READ.  */
 static grub_ssize_t
 grub_xfs_read_file (grub_fshelp_node_t node,
-                    void (*read_hook) (grub_disk_addr_t sector,
+                    void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                        unsigned offset, unsigned length),
                     int pos, grub_size_t len, char *buf)
 {

diff --git a/include/grub/disk.h b/include/grub/disk.h
index 6a067bffb6b839405fe0c4571d108463b8698b24..c4fa11e0901e9bfebd2441d7d2625d9adeb4b104 100644 (file)
--- a/include/grub/disk.h
+++ b/include/grub/disk.h
@@ -95,7 +95,7 @@ struct grub_disk
 
   /* Called when a sector was read. OFFSET is between 0 and
      the sector size minus 1, and LENGTH is between 0 and the sector size.  */
-  void (*read_hook) (grub_disk_addr_t sector,
+  void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                     unsigned offset, unsigned length);
 
   /* Device-specific data.  */

diff --git a/include/grub/file.h b/include/grub/file.h
index da269b397ecf875f70fa39de2677444de257bc1b..df2e9e470e89c0bff15a5988f366f8c562510c5a 100644 (file)
--- a/include/grub/file.h
+++ b/include/grub/file.h
@@ -43,7 +43,7 @@ struct grub_file
   void *data;
 
   /* This is called when a sector is read. Used only for a disk device.  */
-  void (*read_hook) (grub_disk_addr_t sector,
+  void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                     unsigned offset, unsigned length);
 };
 typedef struct grub_file *grub_file_t;

diff --git a/include/grub/fshelp.h b/include/grub/fshelp.h
index 8c756a5255f58fbaf7efd94f09a1f0d1b7101c00..e25dd16a86b7bc58b7cc93f9ec40df201eda3e26 100644 (file)
--- a/include/grub/fshelp.h
+++ b/include/grub/fshelp.h
@@ -63,7 +63,7 @@ EXPORT_FUNC(grub_fshelp_find_file) (const char *path,
    blocks have a size of LOG2BLOCKSIZE (in log2).  */
 grub_ssize_t
 EXPORT_FUNC(grub_fshelp_read_file) (grub_disk_t disk, grub_fshelp_node_t node,
-                                   void (*read_hook) (grub_disk_addr_t sector,
+                                   void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
                                                       unsigned offset,
                                                       unsigned length),
                                    int pos, grub_size_t len, char *buf,

diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index f17d5c45258ec10ce62fc200a60e066fb2c899a4..abbea4c068d925fd4e75cbb1263f23ed2168f3b0 100644 (file)
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -109,9 +109,9 @@ setup (const char *prefix, const char *dir,
   unsigned long first_start = ~0UL;
   int able_to_embed = 1;
   
-  auto void save_first_sector (grub_disk_addr_t sector, unsigned offset,
+  auto void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector, unsigned offset,
                               unsigned length);
-  auto void save_blocklists (grub_disk_addr_t sector, unsigned offset,
+  auto void NESTED_FUNC_ATTR save_blocklists (grub_disk_addr_t sector, unsigned offset,
                             unsigned length);
 
   auto int find_first_partition_start (grub_disk_t disk,
@@ -130,7 +130,7 @@ setup (const char *prefix, const char *dir,
       return 0;
     }
   
-  void save_first_sector (grub_disk_addr_t sector, unsigned offset,
+  void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector, unsigned offset,
                          unsigned length)
     {
       grub_util_info ("the first sector is <%llu,%u,%u>",
@@ -142,7 +142,7 @@ setup (const char *prefix, const char *dir,
       first_sector = sector;
     }
 
-  void save_blocklists (grub_disk_addr_t sector, unsigned offset,
+  void NESTED_FUNC_ATTR save_blocklists (grub_disk_addr_t sector, unsigned offset,
                        unsigned length)
     {
       struct boot_blocklist *prev = block + 1;