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

diff --git a/fe/69c58cdca335b3a1fe5a0cb5b48d5d848d7777 b/fe/69c58cdca335b3a1fe5a0cb5b48d5d848d7777
new file mode 100644 (file)
index 0000000..72e5a4b
--- /dev/null
+++ b/fe/69c58cdca335b3a1fe5a0cb5b48d5d848d7777
@@ -0,0 +1,90 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 92AA340F42C\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Jan 2012 15:27:05 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 4CAh+osp4H9B for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Jan 2012 15:27:04 -0800 (PST)\r
+Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com\r
+ [74.125.83.53])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 8A63540A927   for <notmuch@notmuchmail.org>; Sat,  7 Jan 2012 15:26:50 -0800\r
+ (PST)\r
+Received: by mail-ee0-f53.google.com with SMTP id d41so2133471eek.26\r
+       for <notmuch@notmuchmail.org>; Sat, 07 Jan 2012 15:26:50 -0800 (PST)\r
+Received: by 10.14.16.135 with SMTP id h7mr4133644eeh.19.1325978810170;\r
+       Sat, 07 Jan 2012 15:26:50 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-fe5cdc00-23.dhcp.inet.fi.\r
+       [80.220.92.23])\r
+       by mx.google.com with ESMTPS id q67sm206816226eea.8.2012.01.07.15.26.48\r
+       (version=SSLv3 cipher=OTHER); Sat, 07 Jan 2012 15:26:49 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC PATCH 7/9] util: fix warning about variadic macros\r
+Date: Sun,  8 Jan 2012 01:26:21 +0200\r
+Message-Id:\r
+ <495872b788b4d851e18613372a12c063d3813197.1325977940.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <cover.1325977940.git.jani@nikula.org>\r
+References: <cover.1325977940.git.jani@nikula.org>\r
+In-Reply-To: <cover.1325977940.git.jani@nikula.org>\r
+References: <cover.1325977940.git.jani@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 07 Jan 2012 23:27:06 -0000\r
+\r
+lib/string-list.c: In function ‘_notmuch_string_list_sort’:\r
+lib/string-list.c:81:59: warning: ISO C99 requires rest arguments to be used [enabled by default]\r
+\r
+lib/message-file.c: In function ‘notmuch_message_file_restrict_headersv’:\r
+lib/message-file.c:147:90: warning: ISO C99 requires rest arguments to be used [enabled by default]\r
+\r
+Signed-off-by: Jani Nikula <jani@nikula.org>\r
+---\r
+ util/error_util.h |    8 +++++---\r
+ 1 files changed, 5 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/util/error_util.h b/util/error_util.h\r
+index bb15822..75709da 100644\r
+--- a/util/error_util.h\r
++++ b/util/error_util.h\r
+@@ -38,8 +38,10 @@ _internal_error (const char *format, ...) PRINTF_ATTRIBUTE (1, 2);\r
+  *\r
+  * Note that __location__ comes from talloc.h.\r
+  */\r
+-#define INTERNAL_ERROR(format, ...)                   \\r
+-    _internal_error (format " (%s).\n",                       \\r
+-                   ##__VA_ARGS__, __location__)\r
++#define _INTERNAL_ERROR(format, ...)                  \\r
++    _internal_error (format "%s (%s).\n",             \\r
++                   __VA_ARGS__, __location__)\r
++\r
++#define INTERNAL_ERROR(...) _INTERNAL_ERROR(__VA_ARGS__, "")\r
+ \r
+ #endif\r
+-- \r
+1.7.5.4\r
+\r