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 BAA9840F424
\r
6 for <notmuch@notmuchmail.org>; Sat, 7 Jan 2012 15:27:00 -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 bRA98CU7wmlf for <notmuch@notmuchmail.org>;
\r
17 Sat, 7 Jan 2012 15:26:59 -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 3D33D40A289
\r
22 for <notmuch@notmuchmail.org>; Sat, 7 Jan 2012 15:26:47 -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:47 -0800 (PST)
\r
25 Received: by 10.213.13.220 with SMTP id d28mr2184660eba.98.1325978806855;
\r
26 Sat, 07 Jan 2012 15:26:46 -0800 (PST)
\r
27 Received: from localhost (dsl-hkibrasgw4-fe5cdc00-23.dhcp.inet.fi.
\r
28 [80.220.92.23]) by mx.google.com with ESMTPS id
\r
29 y12sm267562206eeb.11.2012.01.07.15.26.45
\r
30 (version=SSLv3 cipher=OTHER); Sat, 07 Jan 2012 15:26:45 -0800 (PST)
\r
31 From: Jani Nikula <jani@nikula.org>
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [RFC PATCH 6/9] cli: fix another warning about variadic macros
\r
34 Date: Sun, 8 Jan 2012 01:26:20 +0200
\r
36 <ed63eb9fe23df9ee45e5f855002eaf2d61b286c9.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:01 -0000
\r
59 notmuch-setup.c: In function ‘notmuch_setup_command’:
\r
60 notmuch-setup.c:144:62: warning: ISO C99 requires rest arguments to be used [enabled by default]
\r
61 notmuch-setup.c:174:18: warning: ISO C99 requires rest arguments to be used [enabled by default]
\r
63 Signed-off-by: Jani Nikula <jani@nikula.org>
\r
65 notmuch-setup.c | 7 +++++--
\r
66 1 files changed, 5 insertions(+), 2 deletions(-)
\r
68 diff --git a/notmuch-setup.c b/notmuch-setup.c
\r
69 index c3ea937..7b25680 100644
\r
70 --- a/notmuch-setup.c
\r
71 +++ b/notmuch-setup.c
\r
72 @@ -102,9 +102,9 @@ notmuch_setup_command (unused (void *ctx),
\r
73 const char **new_tags;
\r
74 size_t new_tags_len;
\r
76 -#define prompt(format, ...) \
\r
77 +#define __prompt(format, ...) \
\r
79 - printf (format, ##__VA_ARGS__); \
\r
80 + printf (format, __VA_ARGS__); \
\r
82 if (getline (&response, &response_size, stdin) < 0) { \
\r
83 printf ("Exiting.\n"); \
\r
84 @@ -113,6 +113,9 @@ notmuch_setup_command (unused (void *ctx),
\r
85 chomp_newline (response); \
\r
88 +#define _prompt(format, ...) __prompt(format "%s", __VA_ARGS__)
\r
89 +#define prompt(...) _prompt(__VA_ARGS__, "")
\r
91 config = notmuch_config_open (ctx, NULL, &is_new);
\r