lib: replace deprecated n_q_count_threads with status returning version

[notmuch] / notmuch-count.c

diff --git a/notmuch-count.c b/notmuch-count.c
index 07fa5f74f8820116e453f0992ebed6fcb82f04ad..cf80ee25a102fc4f469fc26ce50c85bf8096eb1e 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>
  */
@@ -33,17 +33,19 @@ enum {
     EXCLUDE_FALSE,
 };
 
-static unsigned int
+/* Return the number of files matching the query, or -1 for an error */
+static int
 count_files (notmuch_query_t *query)
 {
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     notmuch_filenames_t *filenames;
-    unsigned int count = 0;
+    notmuch_status_t status;
+    int count = 0;
 
-    messages = notmuch_query_search_messages (query);
-    if (messages == NULL)
-       return 0;
+    status = notmuch_query_search_messages (query, &messages);
+    if (print_status_query ("notmuch count", query, status))
+       return -1;
 
     for (;
         notmuch_messages_valid (messages);
@@ -65,20 +67,24 @@ count_files (notmuch_query_t *query)
     return count;
 }
 
+/* return 0 on success, -1 on failure */
 static int
 print_count (notmuch_database_t *notmuch, const char *query_str,
             const char **exclude_tags, size_t exclude_tags_length, int output, int print_lastmod)
 {
     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) {
        fprintf (stderr, "Out of memory\n");
-       return 1;
+       return -1;
     }
 
     for (i = 0; i < exclude_tags_length; i++)
@@ -86,13 +92,25 @@ 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 (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 (query, &ucount);
+       if (print_status_query ("notmuch count", query, status))
+           return -1;
+       printf ("%u", ucount);
        break;
     case OUTPUT_FILES:
-       printf ("%u", count_files (query));
+       count = count_files (query);
+       if (count >= 0) {
+           printf ("%u", count);
+       } else {
+           ret = -1;
+           goto DONE;
+       }
        break;
     }
 
@@ -103,6 +121,7 @@ print_count (notmuch_database_t *notmuch, const char *query_str,
        fputs ("\n", stdout);
     }
 
+  DONE:
     notmuch_query_destroy (query);
 
     return ret;