1 Return-Path: <jani@nikula.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 92AA340F42C
\r
6 for <notmuch@notmuchmail.org>; Sat, 7 Jan 2012 15:27:05 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
13 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id 4CAh+osp4H9B for <notmuch@notmuchmail.org>;
\r
17 Sat, 7 Jan 2012 15:27:04 -0800 (PST)
\r
18 Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com
\r
19 [74.125.83.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
20 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
21 8A63540A927 for <notmuch@notmuchmail.org>; Sat, 7 Jan 2012 15:26:50 -0800
\r
23 Received: by mail-ee0-f53.google.com with SMTP id d41so2133471eek.26
\r
24 for <notmuch@notmuchmail.org>; Sat, 07 Jan 2012 15:26:50 -0800 (PST)
\r
25 Received: by 10.14.16.135 with SMTP id h7mr4133644eeh.19.1325978810170;
\r
26 Sat, 07 Jan 2012 15:26:50 -0800 (PST)
\r
27 Received: from localhost (dsl-hkibrasgw4-fe5cdc00-23.dhcp.inet.fi.
\r
29 by mx.google.com with ESMTPS id q67sm206816226eea.8.2012.01.07.15.26.48
\r
30 (version=SSLv3 cipher=OTHER); Sat, 07 Jan 2012 15:26:49 -0800 (PST)
\r
31 From: Jani Nikula <jani@nikula.org>
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [RFC PATCH 7/9] util: fix warning about variadic macros
\r
34 Date: Sun, 8 Jan 2012 01:26:21 +0200
\r
36 <495872b788b4d851e18613372a12c063d3813197.1325977940.git.jani@nikula.org>
\r
37 X-Mailer: git-send-email 1.7.5.4
\r
38 In-Reply-To: <cover.1325977940.git.jani@nikula.org>
\r
39 References: <cover.1325977940.git.jani@nikula.org>
\r
40 In-Reply-To: <cover.1325977940.git.jani@nikula.org>
\r
41 References: <cover.1325977940.git.jani@nikula.org>
\r
43 Content-Type: text/plain; charset=UTF-8
\r
44 Content-Transfer-Encoding: 8bit
\r
45 X-BeenThere: notmuch@notmuchmail.org
\r
46 X-Mailman-Version: 2.1.13
\r
48 List-Id: "Use and development of the notmuch mail system."
\r
49 <notmuch.notmuchmail.org>
\r
50 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
52 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
53 List-Post: <mailto:notmuch@notmuchmail.org>
\r
54 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
55 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
56 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
57 X-List-Received-Date: Sat, 07 Jan 2012 23:27:06 -0000
\r
59 lib/string-list.c: In function ‘_notmuch_string_list_sort’:
\r
60 lib/string-list.c:81:59: warning: ISO C99 requires rest arguments to be used [enabled by default]
\r
62 lib/message-file.c: In function ‘notmuch_message_file_restrict_headersv’:
\r
63 lib/message-file.c:147:90: warning: ISO C99 requires rest arguments to be used [enabled by default]
\r
65 Signed-off-by: Jani Nikula <jani@nikula.org>
\r
67 util/error_util.h | 8 +++++---
\r
68 1 files changed, 5 insertions(+), 3 deletions(-)
\r
70 diff --git a/util/error_util.h b/util/error_util.h
\r
71 index bb15822..75709da 100644
\r
72 --- a/util/error_util.h
\r
73 +++ b/util/error_util.h
\r
74 @@ -38,8 +38,10 @@ _internal_error (const char *format, ...) PRINTF_ATTRIBUTE (1, 2);
\r
76 * Note that __location__ comes from talloc.h.
\r
78 -#define INTERNAL_ERROR(format, ...) \
\r
79 - _internal_error (format " (%s).\n", \
\r
80 - ##__VA_ARGS__, __location__)
\r
81 +#define _INTERNAL_ERROR(format, ...) \
\r
82 + _internal_error (format "%s (%s).\n", \
\r
83 + __VA_ARGS__, __location__)
\r
85 +#define INTERNAL_ERROR(...) _INTERNAL_ERROR(__VA_ARGS__, "")
\r