[PATCH 1/3] notmuch-tag: tidy formatting

diff --git a/1a/04bba85d93c5750698c27e8941d45b27d205fb b/1a/04bba85d93c5750698c27e8941d45b27d205fb
new file mode 100644 (file)
index 0000000..9188471
--- /dev/null
+++ b/1a/04bba85d93c5750698c27e8941d45b27d205fb
@@ -0,0 +1,125 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8C902431FC2\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Nov 2012 17:33:42 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 6fSOOPncOaEo for <notmuch@notmuchmail.org>;\r
+       Wed, 14 Nov 2012 17:33:41 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E1BB0431FC0\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Nov 2012 17:33:40 -0800 (PST)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TYoKq-0007YX-4z; Wed, 14 Nov 2012 21:33:40 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TYoKk-0000U1-KF; Wed, 14 Nov 2012 21:33:34 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] notmuch-tag: tidy formatting\r
+Date: Wed, 14 Nov 2012 21:33:20 -0400\r
+Message-Id: <1352943202-1431-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1352943202-1431-1-git-send-email-david@tethera.net>\r
+References: <1352943202-1431-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 15 Nov 2012 01:33:43 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This is just the result of running uncrustify.\r
+---\r
+ notmuch-tag.c |   16 ++++++++--------\r
+ 1 file changed, 8 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/notmuch-tag.c b/notmuch-tag.c\r
+index d15f1ed..88d559b 100644\r
+--- a/notmuch-tag.c\r
++++ b/notmuch-tag.c\r
+@@ -31,7 +31,7 @@ handle_sigint (unused (int sig))\r
+      * result.  It is not required for correctness, and if it does\r
+      * fail or produce a short write, we want to get out of the signal\r
+      * handler as quickly as possible, not retry it. */\r
+-    IGNORE_RESULT (write (2, msg, sizeof(msg)-1));\r
++    IGNORE_RESULT (write (2, msg, sizeof (msg) - 1));\r
+     interrupted = 1;\r
+ }\r
+ \r
+@@ -40,6 +40,7 @@ _escape_tag (char *buf, const char *tag)\r
+ {\r
+     const char *in = tag;\r
+     char *out = buf;\r
++\r
+     /* Boolean terms surrounded by double quotes can contain any\r
+      * character.  Double quotes are quoted by doubling them. */\r
+     *out++ = '"';\r
+@@ -85,8 +86,8 @@ _optimize_tag_query (void *ctx, const char *orig_query_string,\r
+     for (i = 0; tag_ops[i].tag; i++)\r
+       if (strlen (tag_ops[i].tag) > max_tag_len)\r
+           max_tag_len = strlen (tag_ops[i].tag);\r
+-    escaped = talloc_array(ctx, char, max_tag_len * 2 + 3);\r
+-    if (!escaped)\r
++    escaped = talloc_array (ctx, char, max_tag_len * 2 + 3);\r
++    if (! escaped)\r
+       return NULL;\r
+ \r
+     /* Build the new query string */\r
+@@ -140,9 +141,8 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,\r
+     notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);\r
+ \r
+     for (messages = notmuch_query_search_messages (query);\r
+-       notmuch_messages_valid (messages) && !interrupted;\r
+-       notmuch_messages_move_to_next (messages))\r
+-    {\r
++       notmuch_messages_valid (messages) && ! interrupted;\r
++       notmuch_messages_move_to_next (messages)) {\r
+       message = notmuch_messages_get (messages);\r
+ \r
+       notmuch_message_freeze (message);\r
+@@ -204,14 +204,14 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])\r
+       }\r
+       if (argv[i][0] == '+' || argv[i][0] == '-') {\r
+           if (argv[i][0] == '+' && argv[i][1] == '\0') {\r
+-              fprintf(stderr, "Error: tag names cannot be empty.\n");\r
++              fprintf (stderr, "Error: tag names cannot be empty.\n");\r
+               return 1;\r
+           }\r
+           if (argv[i][0] == '+' && argv[i][1] == '-') {\r
+               /* This disallows adding the non-removable tag "-" and\r
+                * enables notmuch tag to take long options in the\r
+                * future. */\r
+-              fprintf(stderr, "Error: tag names must not start with '-'.\n");\r
++              fprintf (stderr, "Error: tag names must not start with '-'.\n");\r
+               return 1;\r
+           }\r
+           tag_ops[tag_ops_count].tag = argv[i] + 1;\r
+-- \r
+1.7.10.4\r
+\r