1 Return-Path: <bremner@tethera.net>
\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 8C902431FC2
\r
6 for <notmuch@notmuchmail.org>; Wed, 14 Nov 2012 17:33:42 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 6fSOOPncOaEo for <notmuch@notmuchmail.org>;
\r
16 Wed, 14 Nov 2012 17:33:41 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id E1BB0431FC0
\r
21 for <notmuch@notmuchmail.org>; Wed, 14 Nov 2012 17:33:40 -0800 (PST)
\r
22 Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([156.34.89.108] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1TYoKq-0007YX-4z; Wed, 14 Nov 2012 21:33:40 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1TYoKk-0000U1-KF; Wed, 14 Nov 2012 21:33:34 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 1/3] notmuch-tag: tidy formatting
\r
34 Date: Wed, 14 Nov 2012 21:33:20 -0400
\r
35 Message-Id: <1352943202-1431-2-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.10.4
\r
37 In-Reply-To: <1352943202-1431-1-git-send-email-david@tethera.net>
\r
38 References: <1352943202-1431-1-git-send-email-david@tethera.net>
\r
40 Cc: David Bremner <bremner@debian.org>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Thu, 15 Nov 2012 01:33:43 -0000
\r
55 From: David Bremner <bremner@debian.org>
\r
57 This is just the result of running uncrustify.
\r
59 notmuch-tag.c | 16 ++++++++--------
\r
60 1 file changed, 8 insertions(+), 8 deletions(-)
\r
62 diff --git a/notmuch-tag.c b/notmuch-tag.c
\r
63 index d15f1ed..88d559b 100644
\r
66 @@ -31,7 +31,7 @@ handle_sigint (unused (int sig))
\r
67 * result. It is not required for correctness, and if it does
\r
68 * fail or produce a short write, we want to get out of the signal
\r
69 * handler as quickly as possible, not retry it. */
\r
70 - IGNORE_RESULT (write (2, msg, sizeof(msg)-1));
\r
71 + IGNORE_RESULT (write (2, msg, sizeof (msg) - 1));
\r
75 @@ -40,6 +40,7 @@ _escape_tag (char *buf, const char *tag)
\r
77 const char *in = tag;
\r
80 /* Boolean terms surrounded by double quotes can contain any
\r
81 * character. Double quotes are quoted by doubling them. */
\r
83 @@ -85,8 +86,8 @@ _optimize_tag_query (void *ctx, const char *orig_query_string,
\r
84 for (i = 0; tag_ops[i].tag; i++)
\r
85 if (strlen (tag_ops[i].tag) > max_tag_len)
\r
86 max_tag_len = strlen (tag_ops[i].tag);
\r
87 - escaped = talloc_array(ctx, char, max_tag_len * 2 + 3);
\r
89 + escaped = talloc_array (ctx, char, max_tag_len * 2 + 3);
\r
93 /* Build the new query string */
\r
94 @@ -140,9 +141,8 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
\r
95 notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
\r
97 for (messages = notmuch_query_search_messages (query);
\r
98 - notmuch_messages_valid (messages) && !interrupted;
\r
99 - notmuch_messages_move_to_next (messages))
\r
101 + notmuch_messages_valid (messages) && ! interrupted;
\r
102 + notmuch_messages_move_to_next (messages)) {
\r
103 message = notmuch_messages_get (messages);
\r
105 notmuch_message_freeze (message);
\r
106 @@ -204,14 +204,14 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
\r
108 if (argv[i][0] == '+' || argv[i][0] == '-') {
\r
109 if (argv[i][0] == '+' && argv[i][1] == '\0') {
\r
110 - fprintf(stderr, "Error: tag names cannot be empty.\n");
\r
111 + fprintf (stderr, "Error: tag names cannot be empty.\n");
\r
114 if (argv[i][0] == '+' && argv[i][1] == '-') {
\r
115 /* This disallows adding the non-removable tag "-" and
\r
116 * enables notmuch tag to take long options in the
\r
118 - fprintf(stderr, "Error: tag names must not start with '-'.\n");
\r
119 + fprintf (stderr, "Error: tag names must not start with '-'.\n");
\r
122 tag_ops[tag_ops_count].tag = argv[i] + 1;
\r