[PATCH 8/8] cli: use notmuch_exclude_t in option parser

diff --git a/83/be6c41268cca9804a97a4c0b131e27552c7a55 b/83/be6c41268cca9804a97a4c0b131e27552c7a55
new file mode 100644 (file)
index 0000000..a78506a
--- /dev/null
+++ b/83/be6c41268cca9804a97a4c0b131e27552c7a55
@@ -0,0 +1,144 @@
+Return-Path: <novalazy@gmail.com>\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 5D5C7431FD8\r
+       for <notmuch@notmuchmail.org>; Wed, 20 Jun 2012 06:30:23 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 cfpwXvqcYlTs for <notmuch@notmuchmail.org>;\r
+       Wed, 20 Jun 2012 06:30:22 -0700 (PDT)\r
+Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com\r
+       [209.85.160.53]) (using TLSv1 with cipher RC4-MD5 (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D94A2429E35\r
+       for <notmuch@notmuchmail.org>; Wed, 20 Jun 2012 06:30:16 -0700 (PDT)\r
+Received: by mail-pb0-f53.google.com with SMTP id rr13so756934pbb.26\r
+       for <notmuch@notmuchmail.org>; Wed, 20 Jun 2012 06:30:16 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=O2TKTmOLZd/DvpzmkmmNaNX8+pmc5tnjB0DJ20sFRiU=;\r
+       b=DXTt1kZF6IVrZYY99KNeBRFh0CJpmv5YhHPq1bfT51pwRdyVO/iyF+WTAzeABztrox\r
+       EV9X7yyS3/9xz/2QlpLvXKXfueHJF4b95LP5nbZTIxUtgUiCN9+N97htrN7qQjInZbfa\r
+       NlAJUbhDMUDg789/7nIga3P4EeDz9qQYr7lKLGQTP7pCgTgxI+Wtl8lf+ZbH4VQtb+Oq\r
+       T/pG0LJYUc716hfN7nJFdDQrKNqrAKeTKnth1xZ4GF5TjcYaqGALU17Uh/bi0RmGNt5j\r
+       bChWAdogv2aNIypSmRDpb8c4h+TfoYmv2UZmRm/AJe8u13hHWM6sJoynhi7jXyfthNrR\r
+       3w/Q==\r
+Received: by 10.68.224.70 with SMTP id ra6mr76383480pbc.11.1340199016721;\r
+       Wed, 20 Jun 2012 06:30:16 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id tj4sm31943519pbc.33.2012.06.20.06.30.14\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 20 Jun 2012 06:30:15 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 8/8] cli: use notmuch_exclude_t in option parser\r
+Date: Wed, 20 Jun 2012 23:29:07 +1000\r
+Message-Id: <1340198947-29370-9-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1340198947-29370-1-git-send-email-novalazy@gmail.com>\r
+References: <1340198947-29370-1-git-send-email-novalazy@gmail.com>\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: Wed, 20 Jun 2012 13:30:23 -0000\r
+\r
+Use notmuch_exclude_t constants directly instead of a redundant\r
+enumeration while parsing search --exclude keyword arguments.\r
+---\r
+ notmuch-search.c |   28 +++++++++-------------------\r
+ 1 files changed, 9 insertions(+), 19 deletions(-)\r
+\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index 027923d..23cf342 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -416,13 +416,6 @@ do_search_tags (notmuch_database_t *notmuch,\r
+     return 0;\r
+ }\r
+ \r
+-enum {\r
+-    EXCLUDE_TRUE,\r
+-    EXCLUDE_FALSE,\r
+-    EXCLUDE_FLAG,\r
+-    EXCLUDE_ALL\r
+-};\r
+-\r
+ int\r
+ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ {\r
+@@ -436,7 +429,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+     output_t output = OUTPUT_SUMMARY;\r
+     int offset = 0;\r
+     int limit = -1; /* unlimited */\r
+-    int exclude = EXCLUDE_TRUE;\r
++    notmuch_exclude_t exclude = NOTMUCH_EXCLUDE_TRUE;\r
+     unsigned int i;\r
+ \r
+     enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }\r
+@@ -459,10 +452,10 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+                                 { "tags", OUTPUT_TAGS },\r
+                                 { 0, 0 } } },\r
+         { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',\r
+-          (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },\r
+-                                  { "false", EXCLUDE_FALSE },\r
+-                                  { "flag", EXCLUDE_FLAG },\r
+-                                  { "all", EXCLUDE_ALL },\r
++          (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE },\r
++                                  { "false", NOTMUCH_EXCLUDE_FALSE },\r
++                                  { "flag", NOTMUCH_EXCLUDE_FLAG },\r
++                                  { "all", NOTMUCH_EXCLUDE_ALL },\r
+                                   { 0, 0 } } },\r
+       { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 },\r
+       { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0  },\r
+@@ -510,15 +503,15 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ \r
+     notmuch_query_set_sort (query, sort);\r
+ \r
+-    if (exclude == EXCLUDE_FLAG && output != OUTPUT_SUMMARY) {\r
++    if (exclude == NOTMUCH_EXCLUDE_FLAG && output != OUTPUT_SUMMARY) {\r
+       /* If we are not doing summary output there is nowhere to\r
+        * print the excluded flag so fall back on including the\r
+        * excluded messages. */\r
+       fprintf (stderr, "Warning: this output format cannot flag excluded messages.\n");\r
+-      exclude = EXCLUDE_FALSE;\r
++      exclude = NOTMUCH_EXCLUDE_FALSE;\r
+     }\r
+ \r
+-    if (exclude != EXCLUDE_FALSE) {\r
++    if (exclude != NOTMUCH_EXCLUDE_FALSE) {\r
+       const char **search_exclude_tags;\r
+       size_t search_exclude_tags_length;\r
+ \r
+@@ -526,10 +519,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+           (config, &search_exclude_tags_length);\r
+       for (i = 0; i < search_exclude_tags_length; i++)\r
+           notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);\r
+-      if (exclude == EXCLUDE_FLAG)\r
+-          notmuch_query_set_omit_excluded (query, NOTMUCH_EXCLUDE_FLAG);\r
+-      if (exclude == EXCLUDE_ALL)\r
+-          notmuch_query_set_omit_excluded (query, NOTMUCH_EXCLUDE_ALL);\r
++      notmuch_query_set_omit_excluded (query, exclude);\r
+     }\r
+ \r
+     switch (output) {\r
+-- \r
+1.7.4.4\r
+\r