* include/grub/emu/misc.h (xasprintf): Add missing format attribute.

	* include/grub/mips/kernel.h (grub_halt): Remove redundant declaration.
	* include/grub/mips/qemu_mips/kernel.h (grub_halt): Likewise.
	* include/grub/misc.h (grub_reboot)
	[GRUB_MACHINE_EMU || GRUB_MACHINE_QEMU_MIPS]: Export.
	(grub_halt) [__mips__]: Likewise.

diff --git a/ChangeLog b/ChangeLog
index f6b3d5ef0285900d5fcfe5b6b08cd5ce1ed79a0a..293b111504d0e25adf4fb2c8c98cc2f71c2e74da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/emu/misc.h (xasprintf): Add missing format attribute.
+       * include/grub/mips/kernel.h (grub_halt): Remove redundant declaration.
+       * include/grub/mips/qemu_mips/kernel.h (grub_halt): Likewise.
+       * include/grub/misc.h (grub_reboot)
+       [GRUB_MACHINE_EMU || GRUB_MACHINE_QEMU_MIPS]: Export.
+       (grub_halt) [__mips__]: Likewise.
+
 2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/efi/memory.h (grub_machine_mmap_iterate):

diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index b4b8f7d285edb5a98b531f27fe837d072bac68dd..a9365f6a1b1d012e256c736c2bd4cd2a8666d06b 100644 (file)
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -60,7 +60,7 @@ grub_util_device_is_mapped (const char *dev);
 void * EXPORT_FUNC(xmalloc) (grub_size_t size) __attribute__ ((warn_unused_result));
 void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) __attribute__ ((warn_unused_result));
 char * EXPORT_FUNC(xstrdup) (const char *str) __attribute__ ((warn_unused_result));
-char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((warn_unused_result));
+char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) __attribute__ ((warn_unused_result));
 
 void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...);
 void EXPORT_FUNC(grub_util_info) (const char *fmt, ...);
@@ -82,7 +82,4 @@ int grub_device_mapper_supported (void);
 
 char *grub_find_root_device_from_mountinfo (const char *dir, char **relroot);
 
-void EXPORT_FUNC(grub_reboot) (void);
-
-
 #endif /* GRUB_EMU_MISC_H */

diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
index d351f17cbf6e3c2dcff53b57dfe3e34fcb67ba29..07b08848d8268617fe0722e16d757ad4c1ed3dd4 100644 (file)
--- a/include/grub/mips/kernel.h
+++ b/include/grub/mips/kernel.h
@@ -21,10 +21,4 @@
 
 #include <grub/symbol.h>
 
-#ifndef ASM_FILE
-
-void EXPORT_FUNC (grub_halt) (void) __attribute__ ((noreturn));
-
-#endif
-
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */

diff --git a/include/grub/mips/qemu_mips/kernel.h b/include/grub/mips/qemu_mips/kernel.h
index 1e7e32401717049ae5a5cf372307ccdabfb86910..8b8b0149e449fc0c8d71288abfa65a8dc0b31442 100644 (file)
--- a/include/grub/mips/qemu_mips/kernel.h
+++ b/include/grub/mips/qemu_mips/kernel.h
@@ -23,7 +23,6 @@
 
 #ifndef ASM_FILE
 
-void EXPORT_FUNC (grub_halt) (void);
 void grub_qemu_init_cirrus (void);
 
 #endif

diff --git a/include/grub/misc.h b/include/grub/misc.h
index 0344d528b085795d4752925e852c9da1b1868228..46715f77c2bd1bd589fdeef0105e3bf92549d8f5 100644 (file)
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -405,12 +405,18 @@ grub_div_roundup (unsigned int x, unsigned int y)
 }
 
 /* Reboot the machine.  */
+#if defined (GRUB_MACHINE_EMU) || defined (GRUB_MACHINE_QEMU_MIPS)
+void EXPORT_FUNC(grub_reboot) (void) __attribute__ ((noreturn));
+#else
 void grub_reboot (void) __attribute__ ((noreturn));
+#endif
 
 #ifdef GRUB_MACHINE_PCBIOS
 /* Halt the system, using APM if possible. If NO_APM is true, don't
  * use APM even if it is available.  */
 void grub_halt (int no_apm) __attribute__ ((noreturn));
+#elif defined (__mips__)
+void EXPORT_FUNC (grub_halt) (void) __attribute__ ((noreturn));
 #else
 void grub_halt (void) __attribute__ ((noreturn));
 #endif