* include/grub/loader.h (grub_loader_register_preboot_hook):

	Use struct preboot * and not void * for handle. All users updated.
	(grub_loader_unregister_preboot_hook): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 485d37f30f5450357e5473a6e3f7fb423ae7e65b..ec65fb11ee62b2960f768f80ce85bd8f470411f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/loader.h (grub_loader_register_preboot_hook):
+       Use struct preboot * and not void * for handle. All users updated.
+       (grub_loader_unregister_preboot_hook): Likewise.
+
 2011-12-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/charset.h (GRUB_MAX_UTF8_PER_UTF16): New const.

diff --git a/grub-core/bus/usb/ohci.c b/grub-core/bus/usb/ohci.c
index b659c3f626b1ddb086ff4b7bbb28981f6c635c52..2291619cb3f6afb1b0f4b7516227ccb1d779d1d7 100644 (file)
--- a/grub-core/bus/usb/ohci.c
+++ b/grub-core/bus/usb/ohci.c
@@ -1426,7 +1426,7 @@ static struct grub_usb_controller_dev usb_controller =
   .detect_dev = grub_ohci_detect_dev
 };
 
-static void *fini_hnd;
+static struct grub_preboot *fini_hnd;
 
 GRUB_MOD_INIT(ohci)
 {

diff --git a/grub-core/commands/boot.c b/grub-core/commands/boot.c
index 7714011bfc45be4d073a485b9c9823fed96ab6d6..5149074c71741c216cf41c39552b7972ee48aaa8 100644 (file)
--- a/grub-core/commands/boot.c
+++ b/grub-core/commands/boot.c
@@ -31,17 +31,17 @@ static grub_err_t (*grub_loader_boot_func) (void);
 static grub_err_t (*grub_loader_unload_func) (void);
 static int grub_loader_noreturn;
 
-struct grub_preboot_t
+struct grub_preboot
 {
   grub_err_t (*preboot_func) (int);
   grub_err_t (*preboot_rest_func) (void);
   grub_loader_preboot_hook_prio_t prio;
-  struct grub_preboot_t *next;
-  struct grub_preboot_t *prev;
+  struct grub_preboot *next;
+  struct grub_preboot *prev;
 };
 
 static int grub_loader_loaded;
-static struct grub_preboot_t *preboots_head = 0,
+static struct grub_preboot *preboots_head = 0,
   *preboots_tail = 0;
 
 int
@@ -51,18 +51,18 @@ grub_loader_is_loaded (void)
 }
 
 /* Register a preboot hook. */
-void *
+struct grub_preboot *
 grub_loader_register_preboot_hook (grub_err_t (*preboot_func) (int noreturn),
                                   grub_err_t (*preboot_rest_func) (void),
                                   grub_loader_preboot_hook_prio_t prio)
 {
-  struct grub_preboot_t *cur, *new_preboot;
+  struct grub_preboot *cur, *new_preboot;
 
   if (! preboot_func && ! preboot_rest_func)
     return 0;
 
-  new_preboot = (struct grub_preboot_t *)
-    grub_malloc (sizeof (struct grub_preboot_t));
+  new_preboot = (struct grub_preboot *)
+    grub_malloc (sizeof (struct grub_preboot));
   if (! new_preboot)
     {
       grub_error (GRUB_ERR_OUT_OF_MEMORY, "hook not added");
@@ -96,9 +96,9 @@ grub_loader_register_preboot_hook (grub_err_t (*preboot_func) (int noreturn),
 }
 
 void
-grub_loader_unregister_preboot_hook (void *hnd)
+grub_loader_unregister_preboot_hook (struct grub_preboot *hnd)
 {
-  struct grub_preboot_t *preb = hnd;
+  struct grub_preboot *preb = hnd;
 
   if (preb->next)
     preb->next->prev = preb->prev;
@@ -143,7 +143,7 @@ grub_err_t
 grub_loader_boot (void)
 {
   grub_err_t err = GRUB_ERR_NONE;
-  struct grub_preboot_t *cur;
+  struct grub_preboot *cur;
 
   if (! grub_loader_loaded)
     return grub_error (GRUB_ERR_NO_KERNEL, "no loaded kernel");

diff --git a/grub-core/commands/i386/pc/sendkey.c b/grub-core/commands/i386/pc/sendkey.c
index 80094c795347288100ba4f4fa4213f091815e163..ab109067209056765ee79700c722ceae9ff32842 100644 (file)
--- a/grub-core/commands/i386/pc/sendkey.c
+++ b/grub-core/commands/i386/pc/sendkey.c
@@ -365,7 +365,7 @@ grub_cmd_sendkey (grub_extcmd_context_t ctxt, int argc, char **args)
 }
 
 static grub_extcmd_t cmd;
-static void *preboot_hook;
+static struct grub_preboot *preboot_hook;
 
 GRUB_MOD_INIT (sendkey)
 {

diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
index 00fc889a7320e09231fea9c3e46812beb24524dc..10b7be687878b4cd4872260ac5a3a845b8c3f7ea 100644 (file)
--- a/grub-core/disk/ahci.c
+++ b/grub-core/disk/ahci.c
@@ -706,7 +706,7 @@ static struct grub_ata_dev grub_ahci_dev =
 
 \f
 
-static void *fini_hnd;
+static struct grub_preboot *fini_hnd;
 
 GRUB_MOD_INIT(ahci)
 {

diff --git a/grub-core/mmap/i386/pc/mmap.c b/grub-core/mmap/i386/pc/mmap.c
index 8dec083f8fc5dbdd778606d6d7a3d18c6c8ca80f..baa41aa2dbe7697d1a6f43788b86983f76635eb4 100644 (file)
--- a/grub-core/mmap/i386/pc/mmap.c
+++ b/grub-core/mmap/i386/pc/mmap.c
@@ -191,7 +191,7 @@ grub_machine_mmap_register (grub_uint64_t start __attribute__ ((unused)),
                            int handle  __attribute__ ((unused)))
 {
   grub_err_t err;
-  static void *preb_handle = 0;
+  static struct grub_preboot *preb_handle = 0;
 
   err = malloc_hook ();
   if (err)

diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 09acea9003dec3d6ba767639346b59a1b6cf835d..d4e445e7107ad06e52268f3864aaca48b7b2d6de 100644 (file)
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -937,7 +937,7 @@ grub_net_restore_hw (void)
   return GRUB_ERR_NONE;
 }
 
-static void *fini_hnd;
+static struct grub_preboot *fini_hnd;
 
 static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute;
 static grub_command_t cmd_lsroutes, cmd_lscards;

diff --git a/include/grub/loader.h b/include/grub/loader.h
index f38deb96a7e4f7e070d9ef16145ada12c0756618..1d70ef049aaae0748c8fecb66faf6d64aabd1e56 100644 (file)
--- a/include/grub/loader.h
+++ b/include/grub/loader.h
@@ -56,11 +56,13 @@ typedef enum {
 } grub_loader_preboot_hook_prio_t;
 
 /* Register a preboot hook. */
-void *EXPORT_FUNC(grub_loader_register_preboot_hook) (grub_err_t (*preboot_func) (int noret),
-                                        grub_err_t (*preboot_rest_func) (void),
-                                        grub_loader_preboot_hook_prio_t prio);
+struct grub_preboot;
+
+struct grub_preboot *EXPORT_FUNC(grub_loader_register_preboot_hook) (grub_err_t (*preboot_func) (int noret),
+                                                                    grub_err_t (*preboot_rest_func) (void),
+                                                                    grub_loader_preboot_hook_prio_t prio);
 
 /* Unregister given preboot hook. */
-void EXPORT_FUNC (grub_loader_unregister_preboot_hook) (void *hnd);
+void EXPORT_FUNC (grub_loader_unregister_preboot_hook) (struct grub_preboot *hnd);
 
 #endif /* ! GRUB_LOADER_HEADER */