From 7ac397aa8da07e94bf3313e4ef9cdf081d0f162a Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 27 Sep 2015 23:59:36 +2100 Subject: [PATCH] [patch v3.1] cli: update to use new count API --- 8c/e83146ae7458843a4f04c9bcbc71a50e98075d | 166 ++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 8c/e83146ae7458843a4f04c9bcbc71a50e98075d diff --git a/8c/e83146ae7458843a4f04c9bcbc71a50e98075d b/8c/e83146ae7458843a4f04c9bcbc71a50e98075d new file mode 100644 index 000000000..456a18d1d --- /dev/null +++ b/8c/e83146ae7458843a4f04c9bcbc71a50e98075d @@ -0,0 +1,166 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 42A8D6DE141E + for ; Sat, 26 Sep 2015 20:00:49 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.111 +X-Spam-Level: +X-Spam-Status: No, score=0.111 tagged_above=-999 required=5 tests=[AWL=0.111] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id RNYc5pFP_r2T for ; + Sat, 26 Sep 2015 20:00:47 -0700 (PDT) +Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id 728C36DE0924 + for ; Sat, 26 Sep 2015 20:00:47 -0700 (PDT) +Received: from remotemail by gitolite.debian.net with local (Exim 4.80) + (envelope-from ) + id 1Zg2C5-0005eM-Pv; Sun, 27 Sep 2015 03:00:05 +0000 +Received: (nullmailer pid 12772 invoked by uid 1000); Sun, 27 Sep 2015 + 02:59:46 -0000 +From: David Bremner +To: David Bremner , notmuch@notmuchmail.org +Subject: [patch v3.1] cli: update to use new count API +Date: Sat, 26 Sep 2015 23:59:36 -0300 +Message-Id: <1443322776-12730-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.5.3 +In-Reply-To: <1443322213-31075-4-git-send-email-david@tethera.net> +References: <1443322213-31075-4-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 27 Sep 2015 03:00:49 -0000 + +Essentially replace each call to notmuch_count_* with the corresponding +_st call, followed by print_status_query. +--- + notmuch-count.c | 12 ++++++++++-- + notmuch-reply.c | 7 ++++++- + notmuch-search.c | 16 ++++++++++++++-- + notmuch-show.c | 7 ++++++- + 4 files changed, 36 insertions(+), 6 deletions(-) + +diff --git a/notmuch-count.c b/notmuch-count.c +index be3e236..0b6e6f5 100644 +--- a/notmuch-count.c ++++ b/notmuch-count.c +@@ -75,9 +75,11 @@ print_count (notmuch_database_t *notmuch, const char *query_str, + notmuch_query_t *query; + size_t i; + int count; ++ unsigned int ucount; + unsigned long revision; + const char *uuid; + int ret = 0; ++ notmuch_status_t status; + + query = notmuch_query_create (notmuch, query_str); + if (query == NULL) { +@@ -90,10 +92,16 @@ print_count (notmuch_database_t *notmuch, const char *query_str, + + switch (output) { + case OUTPUT_MESSAGES: +- printf ("%u", notmuch_query_count_messages (query)); ++ status = notmuch_query_count_messages_st (query, &ucount); ++ if (print_status_query ("notmuch count", query, status)) ++ return -1; ++ printf ("%u", ucount); + break; + case OUTPUT_THREADS: +- printf ("%u", notmuch_query_count_threads (query)); ++ status = notmuch_query_count_threads_st (query, &ucount); ++ if (print_status_query ("notmuch count", query, status)) ++ return -1; ++ printf ("%u", ucount); + break; + case OUTPUT_FILES: + count = count_files (query); +diff --git a/notmuch-reply.c b/notmuch-reply.c +index fd6a1ec..1357142 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -655,9 +655,14 @@ notmuch_reply_format_sprinter(void *ctx, + notmuch_messages_t *messages; + notmuch_message_t *message; + mime_node_t *node; ++ unsigned count; + notmuch_status_t status; + +- if (notmuch_query_count_messages (query) != 1) { ++ status = notmuch_query_count_messages_st (query, &count); ++ if (print_status_query ("notmuch reply", query, status)) ++ return 1; ++ ++ if (count != 1) { + fprintf (stderr, "Error: search term did not match precisely one message.\n"); + return 1; + } +diff --git a/notmuch-search.c b/notmuch-search.c +index 44e582c..6d08c25 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -121,7 +121,13 @@ do_search_threads (search_context_t *ctx) + notmuch_status_t status; + + if (ctx->offset < 0) { +- ctx->offset += notmuch_query_count_threads (ctx->query); ++ unsigned count; ++ notmuch_status_t status; ++ status = notmuch_query_count_threads_st (ctx->query, &count); ++ if (print_status_query ("notmuch search", ctx->query, status)) ++ return 1; ++ ++ ctx->offset += count; + if (ctx->offset < 0) + ctx->offset = 0; + } +@@ -521,7 +527,13 @@ do_search_messages (search_context_t *ctx) + notmuch_status_t status; + + if (ctx->offset < 0) { +- ctx->offset += notmuch_query_count_messages (ctx->query); ++ unsigned count; ++ notmuch_status_t status; ++ status = notmuch_query_count_messages_st (ctx->query, &count); ++ if (print_status_query ("notmuch search", ctx->query, status)) ++ return 1; ++ ++ ctx->offset += count; + if (ctx->offset < 0) + ctx->offset = 0; + } +diff --git a/notmuch-show.c b/notmuch-show.c +index e054808..5a83c60 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -896,8 +896,13 @@ do_show_single (void *ctx, + notmuch_messages_t *messages; + notmuch_message_t *message; + notmuch_status_t status; ++ unsigned int count; + +- if (notmuch_query_count_messages (query) != 1) { ++ status = notmuch_query_count_messages_st (query, &count); ++ if (print_status_query ("notmuch show", query, status)) ++ return 1; ++ ++ if (count != 1) { + fprintf (stderr, "Error: search term did not match precisely one message.\n"); + return 1; + } +-- +2.5.3 + -- 2.26.2