From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uo97d-0006Lq-TL for qemu-devel@nongnu.org; Sun, 16 Jun 2013 05:19:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uo97c-0004Sw-PG for qemu-devel@nongnu.org; Sun, 16 Jun 2013 05:19:41 -0400 From: Stefan Weil Date: Sun, 16 Jun 2013 11:19:31 +0200 Message-Id: <1371374371-17492-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH] audio: Replace static functions in header file by macros, remove GCC_ATTR List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-trivial Cc: Stefan Weil , "Vassili Karpov (malc)" , qemu-devel Using macros instead of static functions for dolog and for ldebug simplifies the code and can also reduce the total code size. GCC_ATTR was only used in audio_int.h, so it is now unused and the definition can be removed from compiler.h. Signed-off-by: Stefan Weil --- audio/audio_int.h | 31 +++---------------------------- include/qemu/compiler.h | 3 --- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/audio/audio_int.h b/audio/audio_int.h index b9b0676..fd019a0 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -243,38 +243,13 @@ static inline int audio_ring_dist (int dst, int src, int len) return (dst >= src) ? (dst - src) : (len - src + dst); } -static void GCC_ATTR dolog (const char *fmt, ...) -{ - va_list ap; - - va_start (ap, fmt); - AUD_vlog (AUDIO_CAP, fmt, ap); - va_end (ap); -} +#define dolog(fmt, ...) AUD_log(AUDIO_CAP, fmt, ## __VA_ARGS__) #ifdef DEBUG -static void GCC_ATTR ldebug (const char *fmt, ...) -{ - va_list ap; - - va_start (ap, fmt); - AUD_vlog (AUDIO_CAP, fmt, ap); - va_end (ap); -} +#define ldebug(fmt, ...) AUD_log(AUDIO_CAP, fmt, ## __VA_ARGS__) #else -#if defined NDEBUG && defined __GNUC__ -#define ldebug(...) -#elif defined NDEBUG && defined _MSC_VER -#define ldebug __noop -#else -static void GCC_ATTR ldebug (const char *fmt, ...) -{ - (void) fmt; -} +#define ldebug(fmt, ...) (void)0 #endif -#endif - -#undef GCC_ATTR #define AUDIO_STRINGIFY_(n) #n #define AUDIO_STRINGIFY(n) AUDIO_STRINGIFY_(n) diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index 6175c24..155b358 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -38,11 +38,9 @@ #if defined __GNUC__ # if !QEMU_GNUC_PREREQ(4, 4) /* gcc versions before 4.4.x don't support gnu_printf, so use printf. */ -# define GCC_ATTR __attribute__((__unused__, format(printf, 1, 2))) # define GCC_FMT_ATTR(n, m) __attribute__((format(printf, n, m))) # else /* Use gnu_printf when supported (qemu uses standard format strings). */ -# define GCC_ATTR __attribute__((__unused__, format(gnu_printf, 1, 2))) # define GCC_FMT_ATTR(n, m) __attribute__((format(gnu_printf, n, m))) # if defined(_WIN32) /* Map __printf__ to __gnu_printf__ because we want standard format strings @@ -51,7 +49,6 @@ # endif # endif #else -#define GCC_ATTR /**/ #define GCC_FMT_ATTR(n, m) #endif -- 1.7.10.4