From e6c368d468538bf9f8d8e25f2d10932f06c12ee7 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 7 Nov 2013 01:23:06 +0100 Subject: [PATCH] * include/grub/misc.h (grub_dprintf): Use unnamed vararg. (grub_boot_time): Likewise. --- ChangeLog | 5 +++++ include/grub/misc.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd60875f0..cb5cc7712 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-07 Vladimir Serbinenko + + * include/grub/misc.h (grub_dprintf): Use unnamed vararg. + (grub_boot_time): Likewise. + 2013-11-07 Vladimir Serbinenko * include/grub/symbol.h (FUNCTION): Use @function rather than diff --git a/include/grub/misc.h b/include/grub/misc.h index bed97600f..958372469 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h @@ -62,7 +62,7 @@ #define ARRAY_SIZE(array) (sizeof (array) / sizeof (array[0])) #define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; } -#define grub_dprintf(condition, fmt, args...) grub_real_dprintf(GRUB_FILE, __LINE__, condition, fmt, ## args) +#define grub_dprintf(condition, ...) grub_real_dprintf(GRUB_FILE, __LINE__, condition, __VA_ARGS__) void *EXPORT_FUNC(grub_memmove) (void *dest, const void *src, grub_size_t n); char *EXPORT_FUNC(grub_strcpy) (char *dest, const char *src); @@ -464,9 +464,9 @@ extern struct grub_boot_time *EXPORT_VAR(grub_boot_time_head); void EXPORT_FUNC(grub_real_boot_time) (const char *file, const int line, const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 3, 4))); -#define grub_boot_time(fmt, args...) grub_real_boot_time(GRUB_FILE, __LINE__, fmt, ## args) +#define grub_boot_time(...) grub_real_boot_time(GRUB_FILE, __LINE__, __VA_ARGS__) #else -#define grub_boot_time(fmt, args...) +#define grub_boot_time(...) #endif #define grub_max(a, b) (((a) > (b)) ? (a) : (b))