--- /dev/null
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 4D48E6DE1435\r
+ for <notmuch@notmuchmail.org>; Mon, 5 Oct 2015 11:26:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.159\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.159 tagged_above=-999 required=5\r
+ tests=[AWL=-0.183, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, URIBL_SBL=0.644, URIBL_SBL_A=0.1]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id G5bGjc4XXoRD for <notmuch@notmuchmail.org>;\r
+ Mon, 5 Oct 2015 11:25:58 -0700 (PDT)\r
+Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com\r
+ [209.85.212.173])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id CF5546DE02D6\r
+ for <notmuch@notmuchmail.org>; Mon, 5 Oct 2015 11:25:57 -0700 (PDT)\r
+Received: by wicfx3 with SMTP id fx3so126874370wic.0\r
+ for <notmuch@notmuchmail.org>; Mon, 05 Oct 2015 11:25:56 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:subject:in-reply-to:references\r
+ :user-agent:date:message-id:mime-version:content-type;\r
+ bh=sSbqIVc97hhuE0tZ1gNwZqnJb73F2sb18lkuzugx2+I=;\r
+ b=akx4w0czGWQu7fQ8fVSGitxUklY/nGt/yw5/ZKtpNVaxIaRqFkpYqZ4WdSDpb/Q8dc\r
+ mDV8KxtAhW32Eomw1ClNZRfxVmk5DDB4Qg0LU3wo2xPFhbB1PxOuAAvVcWiCkSY48QlX\r
+ ky1DmLW90flMqE43ZBdhKnt3+B3rR4hgCQ1BjnK/pdOGSZn9q9Rpo42tqC9OKaoxu1jW\r
+ u4dRIZ/Msa2sV/jxEn3Pl3946jTr+tPXo8x/YpH7LeIBFNcny10ZuleBQxted4xixM0M\r
+ /iS6XBZrs8MlWYK1tzJhir/pMRDafyP0blatTO5ZoTzDm+pgY26+JAHLjKjbfJwVJ1JL\r
+ ju5w==\r
+X-Gm-Message-State:\r
+ ALoCoQl7KBseaUCcvVEPHyRVDu7m2nZW/fHYI9WWxbVLLyB3QMYQHEalCV+tlfxJthdtXN2jmlxZ\r
+X-Received: by 10.194.117.164 with SMTP id kf4mr31923880wjb.9.1444069556218;\r
+ Mon, 05 Oct 2015 11:25:56 -0700 (PDT)\r
+Received: from localhost (mobile-access-bcee9f-54.dhcp.inet.fi.\r
+ [188.238.159.54])\r
+ by smtp.gmail.com with ESMTPSA id cc8sm14758342wjc.46.2015.10.05.11.25.55\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Mon, 05 Oct 2015 11:25:55 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v4 4/9] cli: update to use new count API\r
+In-Reply-To: <1443367923-11867-5-git-send-email-david@tethera.net>\r
+References: <1443367923-11867-1-git-send-email-david@tethera.net>\r
+ <1443367923-11867-5-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.20.2+101~g7b7dadb (http://notmuchmail.org) Emacs/24.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Mon, 05 Oct 2015 21:25:29 +0300\r
+Message-ID: <87egh9895y.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\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: Mon, 05 Oct 2015 18:26:00 -0000\r
+\r
+On Sun, 27 Sep 2015, David Bremner <david@tethera.net> wrote:\r
+> Essentially replace each call to notmuch_count_* with the corresponding\r
+> _st call, followed by print_status_query.\r
+\r
+LGTM.\r
+\r
+> ---\r
+> notmuch-count.c | 12 ++++++++++--\r
+> notmuch-reply.c | 7 ++++++-\r
+> notmuch-search.c | 16 ++++++++++++++--\r
+> notmuch-show.c | 7 ++++++-\r
+> 4 files changed, 36 insertions(+), 6 deletions(-)\r
+>\r
+> diff --git a/notmuch-count.c b/notmuch-count.c\r
+> index be3e236..0b6e6f5 100644\r
+> --- a/notmuch-count.c\r
+> +++ b/notmuch-count.c\r
+> @@ -75,9 +75,11 @@ print_count (notmuch_database_t *notmuch, const char *query_str,\r
+> notmuch_query_t *query;\r
+> size_t i;\r
+> int count;\r
+> + unsigned int ucount;\r
+> unsigned long revision;\r
+> const char *uuid;\r
+> int ret = 0;\r
+> + notmuch_status_t status;\r
+> \r
+> query = notmuch_query_create (notmuch, query_str);\r
+> if (query == NULL) {\r
+> @@ -90,10 +92,16 @@ print_count (notmuch_database_t *notmuch, const char *query_str,\r
+> \r
+> switch (output) {\r
+> case OUTPUT_MESSAGES:\r
+> - printf ("%u", notmuch_query_count_messages (query));\r
+> + status = notmuch_query_count_messages_st (query, &ucount);\r
+> + if (print_status_query ("notmuch count", query, status))\r
+> + return -1;\r
+> + printf ("%u", ucount);\r
+> break;\r
+> case OUTPUT_THREADS:\r
+> - printf ("%u", notmuch_query_count_threads (query));\r
+> + status = notmuch_query_count_threads_st (query, &ucount);\r
+> + if (print_status_query ("notmuch count", query, status))\r
+> + return -1;\r
+> + printf ("%u", ucount);\r
+> break;\r
+> case OUTPUT_FILES:\r
+> count = count_files (query);\r
+> diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+> index fd6a1ec..1357142 100644\r
+> --- a/notmuch-reply.c\r
+> +++ b/notmuch-reply.c\r
+> @@ -655,9 +655,14 @@ notmuch_reply_format_sprinter(void *ctx,\r
+> notmuch_messages_t *messages;\r
+> notmuch_message_t *message;\r
+> mime_node_t *node;\r
+> + unsigned count;\r
+> notmuch_status_t status;\r
+> \r
+> - if (notmuch_query_count_messages (query) != 1) {\r
+> + status = notmuch_query_count_messages_st (query, &count);\r
+> + if (print_status_query ("notmuch reply", query, status))\r
+> + return 1;\r
+> +\r
+> + if (count != 1) {\r
+> fprintf (stderr, "Error: search term did not match precisely one message.\n");\r
+> return 1;\r
+> }\r
+> diff --git a/notmuch-search.c b/notmuch-search.c\r
+> index 44e582c..6d08c25 100644\r
+> --- a/notmuch-search.c\r
+> +++ b/notmuch-search.c\r
+> @@ -121,7 +121,13 @@ do_search_threads (search_context_t *ctx)\r
+> notmuch_status_t status;\r
+> \r
+> if (ctx->offset < 0) {\r
+> - ctx->offset += notmuch_query_count_threads (ctx->query);\r
+> + unsigned count;\r
+> + notmuch_status_t status;\r
+> + status = notmuch_query_count_threads_st (ctx->query, &count);\r
+> + if (print_status_query ("notmuch search", ctx->query, status))\r
+> + return 1;\r
+> +\r
+> + ctx->offset += count;\r
+> if (ctx->offset < 0)\r
+> ctx->offset = 0;\r
+> }\r
+> @@ -521,7 +527,13 @@ do_search_messages (search_context_t *ctx)\r
+> notmuch_status_t status;\r
+> \r
+> if (ctx->offset < 0) {\r
+> - ctx->offset += notmuch_query_count_messages (ctx->query);\r
+> + unsigned count;\r
+> + notmuch_status_t status;\r
+> + status = notmuch_query_count_messages_st (ctx->query, &count);\r
+> + if (print_status_query ("notmuch search", ctx->query, status))\r
+> + return 1;\r
+> +\r
+> + ctx->offset += count;\r
+> if (ctx->offset < 0)\r
+> ctx->offset = 0;\r
+> }\r
+> diff --git a/notmuch-show.c b/notmuch-show.c\r
+> index e054808..5a83c60 100644\r
+> --- a/notmuch-show.c\r
+> +++ b/notmuch-show.c\r
+> @@ -896,8 +896,13 @@ do_show_single (void *ctx,\r
+> notmuch_messages_t *messages;\r
+> notmuch_message_t *message;\r
+> notmuch_status_t status;\r
+> + unsigned int count;\r
+> \r
+> - if (notmuch_query_count_messages (query) != 1) {\r
+> + status = notmuch_query_count_messages_st (query, &count);\r
+> + if (print_status_query ("notmuch show", query, status))\r
+> + return 1;\r
+> +\r
+> + if (count != 1) {\r
+> fprintf (stderr, "Error: search term did not match precisely one message.\n");\r
+> return 1;\r
+> }\r
+> -- \r
+> 2.5.3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff