X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fquery.cc;h=792aba219fa48d53e3b761089eac1d4349b5c0fb;hp=212e27f0bc8e162f90abf7dd9bfc7bd3d80c10f9;hb=9201c502047816f2a22346fb02c971c50e5a7fcf;hpb=242d5a3ed5ed85bb935c8ed4a4678d7596d8534d

diff --git a/lib/query.cc b/lib/query.cc
index 212e27f0..792aba21 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -29,7 +29,7 @@ struct _notmuch_query {
     notmuch_sort_t sort;
     notmuch_string_list_t *exclude_terms;
     notmuch_exclude_t omit_excluded;
-    notmuch_bool_t parsed;
+    bool parsed;
     Xapian::Query xapian_query;
     std::set<std::string> terms;
 };
@@ -49,7 +49,7 @@ struct _notmuch_doc_id_set {
 #define DOCIDSET_WORD(bit) ((bit) / CHAR_BIT)
 #define DOCIDSET_BIT(bit) ((bit) % CHAR_BIT)
 
-struct visible _notmuch_threads {
+struct _notmuch_threads {
     notmuch_query_t *query;
 
     /* The ordered list of doc ids matched by the query. */
@@ -62,21 +62,23 @@ struct visible _notmuch_threads {
 };
 
 /* We need this in the message functions so forward declare. */
-static notmuch_bool_t
+static bool
 _notmuch_doc_id_set_init (void *ctx,
 			  notmuch_doc_id_set_t *doc_ids,
 			  GArray *arr);
 
-static notmuch_bool_t
+static bool
 _debug_query (void)
 {
     char *env = getenv ("NOTMUCH_DEBUG_QUERY");
+
     return (env && strcmp (env, "") != 0);
 }
 
 /* Explicit destructor call for placement new */
 static int
-_notmuch_query_destructor (notmuch_query_t *query) {
+_notmuch_query_destructor (notmuch_query_t *query)
+{
     query->xapian_query.~Query();
     query->terms.~set<std::string>();
     return 0;
@@ -97,7 +99,7 @@ notmuch_query_create (notmuch_database_t *notmuch,
 
     new (&query->xapian_query) Xapian::Query ();
     new (&query->terms) std::set<std::string> ();
-    query->parsed = FALSE;
+    query->parsed = false;
 
     talloc_set_destructor (query, _notmuch_query_destructor);
 
@@ -123,28 +125,28 @@ _notmuch_query_ensure_parsed (notmuch_query_t *query)
     try {
 	query->xapian_query =
 	    query->notmuch->query_parser->
-		parse_query (query->query_string, NOTMUCH_QUERY_PARSER_FLAGS);
+	    parse_query (query->query_string, NOTMUCH_QUERY_PARSER_FLAGS);
 
-       /* Xapian doesn't support skip_to on terms from a query since
-	*  they are unordered, so cache a copy of all terms in
-	*  something searchable.
-	*/
+	/* Xapian doesn't support skip_to on terms from a query since
+	 *  they are unordered, so cache a copy of all terms in
+	 *  something searchable.
+	 */
 
 	for (Xapian::TermIterator t = query->xapian_query.get_terms_begin ();
 	     t != query->xapian_query.get_terms_end (); ++t)
 	    query->terms.insert (*t);
 
-	query->parsed = TRUE;
+	query->parsed = true;
 
     } catch (const Xapian::Error &error) {
-	if (!query->notmuch->exception_reported) {
+	if (! query->notmuch->exception_reported) {
 	    _notmuch_database_log (query->notmuch,
 				   "A Xapian exception occurred parsing query: %s\n",
 				   error.get_msg ().c_str ());
 	    _notmuch_database_log_append (query->notmuch,
 					  "Query string was: %s\n",
 					  query->query_string);
-	    query->notmuch->exception_reported = TRUE;
+	    query->notmuch->exception_reported = true;
 	}
 
 	return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
@@ -188,7 +190,7 @@ notmuch_query_add_tag_exclude (notmuch_query_t *query, const char *tag)
 	return status;
 
     term = talloc_asprintf (query, "%s%s", _find_prefix ("tag"), tag);
-    if (query->terms.count(term) != 0)
+    if (query->terms.count (term) != 0)
 	return NOTMUCH_STATUS_IGNORED;
 
     _notmuch_string_list_append (query->exclude_terms, term);
@@ -236,7 +238,7 @@ notmuch_query_search_messages_st (notmuch_query_t *query,
 
 notmuch_status_t
 notmuch_query_search_messages (notmuch_query_t *query,
-				  notmuch_messages_t **out)
+			       notmuch_messages_t **out)
 {
     return _notmuch_query_search_documents (query, "mail", out);
 }
@@ -261,7 +263,7 @@ _notmuch_query_search_documents (notmuch_query_t *query,
 
     try {
 
-	messages->base.is_of_list_type = FALSE;
+	messages->base.is_of_list_type = false;
 	messages->base.iterator = NULL;
 	messages->notmuch = notmuch;
 	new (&messages->iterator) Xapian::MSetIterator ();
@@ -278,8 +280,7 @@ _notmuch_query_search_documents (notmuch_query_t *query,
 	Xapian::MSetIterator iterator;
 
 	if (strcmp (query_string, "") == 0 ||
-	    strcmp (query_string, "*") == 0)
-	{
+	    strcmp (query_string, "*") == 0) {
 	    final_query = mail_query;
 	} else {
 	    final_query = Xapian::Query (Xapian::Query::OP_AND,
@@ -291,20 +292,19 @@ _notmuch_query_search_documents (notmuch_query_t *query,
 	    exclude_query = _notmuch_exclude_tags (query);
 
 	    if (query->omit_excluded == NOTMUCH_EXCLUDE_TRUE ||
-		query->omit_excluded == NOTMUCH_EXCLUDE_ALL)
-	    {
+		query->omit_excluded == NOTMUCH_EXCLUDE_ALL) {
 		final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,
 					     final_query, exclude_query);
 	    } else { /* NOTMUCH_EXCLUDE_FLAG */
 		exclude_query = Xapian::Query (Xapian::Query::OP_AND,
-					   exclude_query, final_query);
+					       exclude_query, final_query);
 
-		enquire.set_weighting_scheme (Xapian::BoolWeight());
+		enquire.set_weighting_scheme (Xapian::BoolWeight ());
 		enquire.set_query (exclude_query);
 
 		mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());
 
-		GArray *excluded_doc_ids = g_array_new (FALSE, FALSE, sizeof (unsigned int));
+		GArray *excluded_doc_ids = g_array_new (false, false, sizeof (unsigned int));
 
 		for (iterator = mset.begin (); iterator != mset.end (); iterator++) {
 		    unsigned int doc_id = *iterator;
@@ -318,17 +318,17 @@ _notmuch_query_search_documents (notmuch_query_t *query,
 	}
 
 
-	enquire.set_weighting_scheme (Xapian::BoolWeight());
+	enquire.set_weighting_scheme (Xapian::BoolWeight ());
 
 	switch (query->sort) {
 	case NOTMUCH_SORT_OLDEST_FIRST:
-	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE);
+	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, false);
 	    break;
 	case NOTMUCH_SORT_NEWEST_FIRST:
-	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, TRUE);
+	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, true);
 	    break;
 	case NOTMUCH_SORT_MESSAGE_ID:
-	    enquire.set_sort_by_value (NOTMUCH_VALUE_MESSAGE_ID, FALSE);
+	    enquire.set_sort_by_value (NOTMUCH_VALUE_MESSAGE_ID, false);
 	    break;
 	case NOTMUCH_SORT_UNSORTED:
 	    break;
@@ -354,18 +354,18 @@ _notmuch_query_search_documents (notmuch_query_t *query,
     } catch (const Xapian::Error &error) {
 	_notmuch_database_log (notmuch,
 			       "A Xapian exception occurred performing query: %s\n",
-			       error.get_msg().c_str());
+			       error.get_msg ().c_str ());
 	_notmuch_database_log_append (notmuch,
-			       "Query string was: %s\n",
-			       query->query_string);
+				      "Query string was: %s\n",
+				      query->query_string);
 
-	notmuch->exception_reported = TRUE;
+	notmuch->exception_reported = true;
 	talloc_free (messages);
 	return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
     }
 }
 
-notmuch_bool_t
+bool
 _notmuch_mset_messages_valid (notmuch_messages_t *messages)
 {
     notmuch_mset_messages_t *mset_messages;
@@ -408,14 +408,13 @@ _notmuch_mset_messages_get (notmuch_messages_t *messages)
 				       &status);
 
     if (message == NULL &&
-       status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND)
-    {
+	status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) {
 	INTERNAL_ERROR ("a messages iterator contains a non-existent document ID.\n");
     }
 
     if (messages->excluded_doc_ids &&
 	_notmuch_doc_id_set_contains (messages->excluded_doc_ids, doc_id))
-	notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, TRUE);
+	notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, true);
 
     return message;
 }
@@ -430,7 +429,7 @@ _notmuch_mset_messages_move_to_next (notmuch_messages_t *messages)
     mset_messages->iterator++;
 }
 
-static notmuch_bool_t
+static bool
 _notmuch_doc_id_set_init (void *ctx,
 			  notmuch_doc_id_set_t *doc_ids,
 			  GArray *arr)
@@ -439,30 +438,30 @@ _notmuch_doc_id_set_init (void *ctx,
     unsigned char *bitmap;
 
     for (unsigned int i = 0; i < arr->len; i++)
-	max = MAX(max, g_array_index (arr, unsigned int, i));
-    bitmap = talloc_zero_array (ctx, unsigned char, DOCIDSET_WORD(max) + 1);
+	max = MAX (max, g_array_index (arr, unsigned int, i));
+    bitmap = talloc_zero_array (ctx, unsigned char, DOCIDSET_WORD (max) + 1);
 
     if (bitmap == NULL)
-	return FALSE;
+	return false;
 
     doc_ids->bitmap = bitmap;
     doc_ids->bound = max + 1;
 
     for (unsigned int i = 0; i < arr->len; i++) {
 	unsigned int doc_id = g_array_index (arr, unsigned int, i);
-	bitmap[DOCIDSET_WORD(doc_id)] |= 1 << DOCIDSET_BIT(doc_id);
+	bitmap[DOCIDSET_WORD (doc_id)] |= 1 << DOCIDSET_BIT (doc_id);
     }
 
-    return TRUE;
+    return true;
 }
 
-notmuch_bool_t
+bool
 _notmuch_doc_id_set_contains (notmuch_doc_id_set_t *doc_ids,
 			      unsigned int doc_id)
 {
     if (doc_id >= doc_ids->bound)
-	return FALSE;
-    return doc_ids->bitmap[DOCIDSET_WORD(doc_id)] & (1 << DOCIDSET_BIT(doc_id));
+	return false;
+    return doc_ids->bitmap[DOCIDSET_WORD (doc_id)] & (1 << DOCIDSET_BIT (doc_id));
 }
 
 void
@@ -470,7 +469,7 @@ _notmuch_doc_id_set_remove (notmuch_doc_id_set_t *doc_ids,
 			    unsigned int doc_id)
 {
     if (doc_id < doc_ids->bound)
-	doc_ids->bitmap[DOCIDSET_WORD(doc_id)] &= ~(1 << DOCIDSET_BIT(doc_id));
+	doc_ids->bitmap[DOCIDSET_WORD (doc_id)] &= ~(1 << DOCIDSET_BIT (doc_id));
 }
 
 /* Glib objects force use to use a talloc destructor as well, (but not
@@ -489,7 +488,7 @@ _notmuch_threads_destructor (notmuch_threads_t *threads)
 notmuch_status_t
 notmuch_query_search_threads_st (notmuch_query_t *query, notmuch_threads_t **out)
 {
-    return notmuch_query_search_threads(query, out);
+    return notmuch_query_search_threads (query, out);
 }
 
 notmuch_status_t
@@ -514,7 +513,7 @@ notmuch_query_search_threads (notmuch_query_t *query,
 	return status;
     }
 
-    threads->doc_ids = g_array_new (FALSE, FALSE, sizeof (unsigned int));
+    threads->doc_ids = g_array_new (false, false, sizeof (unsigned int));
     while (notmuch_messages_valid (messages)) {
 	unsigned int doc_id = _notmuch_mset_messages_get_doc_id (messages);
 	g_array_append_val (threads->doc_ids, doc_id);
@@ -546,7 +545,7 @@ notmuch_threads_valid (notmuch_threads_t *threads)
     unsigned int doc_id;
 
     if (! threads)
-	return FALSE;
+	return false;
 
     while (threads->doc_id_pos < threads->doc_ids->len) {
 	doc_id = g_array_index (threads->doc_ids, unsigned int,
@@ -624,8 +623,7 @@ _notmuch_query_count_documents (notmuch_query_t *query, const char *type, unsign
 	Xapian::MSet mset;
 
 	if (strcmp (query_string, "") == 0 ||
-	    strcmp (query_string, "*") == 0)
-	{
+	    strcmp (query_string, "*") == 0) {
 	    final_query = mail_query;
 	} else {
 	    final_query = Xapian::Query (Xapian::Query::OP_AND,
@@ -635,10 +633,10 @@ _notmuch_query_count_documents (notmuch_query_t *query, const char *type, unsign
 	exclude_query = _notmuch_exclude_tags (query);
 
 	final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,
-					 final_query, exclude_query);
+				     final_query, exclude_query);
 
-	enquire.set_weighting_scheme(Xapian::BoolWeight());
-	enquire.set_docid_order(Xapian::Enquire::ASCENDING);
+	enquire.set_weighting_scheme (Xapian::BoolWeight ());
+	enquire.set_docid_order (Xapian::Enquire::ASCENDING);
 
 	if (_debug_query ()) {
 	    fprintf (stderr, "Exclude query is:\n%s\n",
@@ -652,17 +650,17 @@ _notmuch_query_count_documents (notmuch_query_t *query, const char *type, unsign
 	/*
 	 * Set the checkatleast parameter to the number of documents
 	 * in the database to make get_matches_estimated() exact.
-	 * Set the max parameter to 0 to avoid fetching documents we will discard.
+	 * Set the max parameter to 1 to avoid fetching documents we will discard.
 	 */
-	mset = enquire.get_mset (0, 0,
+	mset = enquire.get_mset (0, 1,
 				 notmuch->xapian_db->get_doccount ());
 
-	count = mset.get_matches_estimated();
+	count = mset.get_matches_estimated ();
 
     } catch (const Xapian::Error &error) {
 	_notmuch_database_log (notmuch,
 			       "A Xapian exception occurred performing query: %s\n",
-			       error.get_msg().c_str());
+			       error.get_msg ().c_str ());
 	_notmuch_database_log_append (notmuch,
 				      "Query string was: %s\n",
 				      query->query_string);