Merge branch 'release'

[notmuch] / notmuch-count.c

diff --git a/notmuch-count.c b/notmuch-count.c
index be3e2365a052ad5c770b7a898630f7e48bab8b85..35a2aa707b4d88e62a357b6e123a0e19e2decaa0 100644 (file)
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Keith Packard <keithp@keithp.com>
  */
@@ -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);