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 CA34F431FAF
\r
6 for <notmuch@notmuchmail.org>; Wed, 26 Dec 2012 07:40:51 -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 64vn1GFD3xT7 for <notmuch@notmuchmail.org>;
\r
16 Wed, 26 Dec 2012 07:40:51 -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 4524B431FAE
\r
21 for <notmuch@notmuchmail.org>; Wed, 26 Dec 2012 07:40:51 -0800 (PST)
\r
22 Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([156.34.82.78] 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 1Tnt6A-0002cE-0b; Wed, 26 Dec 2012 11:40:50 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1Tnt64-0003xP-FT; Wed, 26 Dec 2012 11:40:44 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH] notmuch.c: run uncrustify
\r
34 Date: Wed, 26 Dec 2012 11:40:34 -0400
\r
35 Message-Id: <1356536434-15179-1-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.10.4
\r
38 Cc: David Bremner <bremner@debian.org>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Wed, 26 Dec 2012 15:40:51 -0000
\r
53 From: David Bremner <bremner@debian.org>
\r
55 In anticipation of doing some updates to this code, it simplifies life
\r
56 if the code is "uncrustify clean" to start with
\r
58 notmuch.c | 23 +++++++++++------------
\r
59 1 file changed, 11 insertions(+), 12 deletions(-)
\r
61 diff --git a/notmuch.c b/notmuch.c
\r
62 index 9516dfb..ee2892e 100644
\r
67 #include "notmuch-client.h"
\r
69 -typedef int (*command_function_t) (void *ctx, int argc, char *argv[]);
\r
70 +typedef int (*command_function_t)(void *ctx, int argc, char *argv[]);
\r
72 typedef struct command {
\r
74 @@ -39,8 +39,8 @@ typedef struct alias {
\r
77 alias_t aliases[] = {
\r
78 - { "part", { "show", "--format=raw"}},
\r
79 - { "search-tags", {"search", "--output=tags", "*"}}
\r
80 + { "part", { "show", "--format=raw" } },
\r
81 + { "search-tags", { "search", "--output=tags", "*" } }
\r
85 @@ -66,7 +66,7 @@ static command_t commands[] = {
\r
86 "[options...] <search-terms> [...]",
\r
87 "Construct a reply template for a set of messages." },
\r
88 { "tag", notmuch_tag_command,
\r
89 - "+<tag>|-<tag> [...] [--] <search-terms> [...]" ,
\r
90 + "+<tag>|-<tag> [...] [--] <search-terms> [...]",
\r
91 "Add/remove tags for all messages matching the search terms." },
\r
92 { "dump", notmuch_dump_command,
\r
93 "[<filename>] [--] [<search-terms>]",
\r
94 @@ -107,8 +107,8 @@ usage (FILE *out)
\r
96 fprintf (out, "\n");
\r
98 - "Use \"notmuch help <command>\" for more details on each command\n"
\r
99 - "and \"notmuch help search-terms\" for the common search-terms syntax.\n\n");
\r
100 + "Use \"notmuch help <command>\" for more details on each command\n"
\r
101 + "and \"notmuch help search-terms\" for the common search-terms syntax.\n\n");
\r
105 @@ -281,15 +281,14 @@ main (int argc, char *argv[])
\r
106 return notmuch_help_command (NULL, argc - 1, &argv[1]);
\r
108 if (strcmp (argv[1], "--version") == 0) {
\r
109 - printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n");
\r
110 + printf ("notmuch " STRINGIFY (NOTMUCH_VERSION) "\n");
\r
114 for (i = 0; i < ARRAY_SIZE (aliases); i++) {
\r
115 alias = &aliases[i];
\r
117 - if (strcmp (argv[1], alias->name) == 0)
\r
119 + if (strcmp (argv[1], alias->name) == 0) {
\r
122 argv_local = talloc_size (local, sizeof (char *) *
\r
123 @@ -304,14 +303,14 @@ main (int argc, char *argv[])
\r
124 for (j = 0; j < MAX_ALIAS_SUBSTITUTIONS; j++) {
\r
125 if (alias->substitutions[j] == NULL)
\r
127 - argv_local[j+1] = alias->substitutions[j];
\r
128 + argv_local[j + 1] = alias->substitutions[j];
\r
132 /* And copy all original arguments (skipping the argument
\r
133 * that matched the alias of course. */
\r
134 for (j = 2; j < (unsigned) argc; j++) {
\r
135 - argv_local[substitutions+j-1] = argv[j];
\r
136 + argv_local[substitutions + j - 1] = argv[j];
\r
139 argc += substitutions - 1;
\r
140 @@ -323,7 +322,7 @@ main (int argc, char *argv[])
\r
141 command = &commands[i];
\r
143 if (strcmp (argv[1], command->name) == 0)
\r
144 - return (command->function) (local, argc - 1, &argv[1]);
\r
145 + return (command->function)(local, argc - 1, &argv[1]);
\r
148 fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
\r