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 83B5C40EF04
\r
6 for <notmuch@notmuchmail.org>; Sat, 7 Jan 2012 15:26:47 -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 FWu5taBLSJYj for <notmuch@notmuchmail.org>;
\r
17 Sat, 7 Jan 2012 15:26:46 -0800 (PST)
\r
18 Received: from mail-ey0-f181.google.com (mail-ey0-f181.google.com
\r
19 [209.85.215.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id CE23140EEEA
\r
22 for <notmuch@notmuchmail.org>; Sat, 7 Jan 2012 15:26:43 -0800 (PST)
\r
23 Received: by mail-ey0-f181.google.com with SMTP id i1so1939016eaa.26
\r
24 for <notmuch@notmuchmail.org>; Sat, 07 Jan 2012 15:26:43 -0800 (PST)
\r
25 Received: by 10.213.5.20 with SMTP id 20mr547559ebt.112.1325978803410;
\r
26 Sat, 07 Jan 2012 15:26:43 -0800 (PST)
\r
27 Received: from localhost (dsl-hkibrasgw4-fe5cdc00-23.dhcp.inet.fi.
\r
29 by mx.google.com with ESMTPS id e12sm117864982eea.5.2012.01.07.15.26.41
\r
30 (version=SSLv3 cipher=OTHER); Sat, 07 Jan 2012 15:26:42 -0800 (PST)
\r
31 From: Jani Nikula <jani@nikula.org>
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [RFC PATCH 5/9] cli: fix warning about variadic macros
\r
34 Date: Sun, 8 Jan 2012 01:26:19 +0200
\r
36 <0c0e78b61e30129384d34a540f8e52479ea9f06f.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:26:47 -0000
\r
59 notmuch-restore.c: In function ‘notmuch_restore_command’:
\r
60 notmuch-restore.c:87:54: warning: ISO C99 requires rest arguments to be used [enabled by default]
\r
62 and elsewhere. ##__VA_ARGS__ is a GCC CPP extension.
\r
64 Signed-off-by: Jani Nikula <jani@nikula.org>
\r
66 notmuch-client.h | 9 ++++++---
\r
67 1 files changed, 6 insertions(+), 3 deletions(-)
\r
69 diff --git a/notmuch-client.h b/notmuch-client.h
\r
70 index 517c010..3f4751a 100644
\r
71 --- a/notmuch-client.h
\r
72 +++ b/notmuch-client.h
\r
73 @@ -93,14 +93,17 @@ typedef struct notmuch_show_params {
\r
75 * Note that __location__ comes from talloc.h.
\r
77 -#define INTERNAL_ERROR(format, ...) \
\r
79 +#define _INTERNAL_ERROR(format, ...) \
\r
82 - "Internal error: " format " (%s)\n", \
\r
83 - ##__VA_ARGS__, __location__); \
\r
84 + "Internal error: " format "%s (%s)\n", \
\r
85 + __VA_ARGS__, __location__); \
\r
89 +#define INTERNAL_ERROR(...) _INTERNAL_ERROR(__VA_ARGS__, "")
\r
91 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
\r
93 #define STRNCMP_LITERAL(var, literal) \
\r