[RFC PATCH 7/9] util: fix warning about variadic macros

Jani Nikula jani at nikula.org
Sat Jan 7 15:26:21 PST 2012


lib/string-list.c: In function ‘_notmuch_string_list_sort’:
lib/string-list.c:81:59: warning: ISO C99 requires rest arguments to be used [enabled by default]

lib/message-file.c: In function ‘notmuch_message_file_restrict_headersv’:
lib/message-file.c:147:90: warning: ISO C99 requires rest arguments to be used [enabled by default]

Signed-off-by: Jani Nikula <jani at nikula.org>
---
 util/error_util.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/util/error_util.h b/util/error_util.h
index bb15822..75709da 100644
--- a/util/error_util.h
+++ b/util/error_util.h
@@ -38,8 +38,10 @@ _internal_error (const char *format, ...) PRINTF_ATTRIBUTE (1, 2);
  *
  * Note that __location__ comes from talloc.h.
  */
-#define INTERNAL_ERROR(format, ...)			\
-    _internal_error (format " (%s).\n",			\
-		     ##__VA_ARGS__, __location__)
+#define _INTERNAL_ERROR(format, ...)			\
+    _internal_error (format "%s (%s).\n",		\
+		     __VA_ARGS__, __location__)
+
+#define INTERNAL_ERROR(...) _INTERNAL_ERROR(__VA_ARGS__, "")
 
 #endif
-- 
1.7.5.4



More information about the notmuch mailing list