build: visibility=default for library structs is no longer needed

[notmuch] / lib / query.cc

diff --git a/lib/query.cc b/lib/query.cc
index b7d4d3527d5a8b7062cb98b8e5342b6908c92525..9c6ecc8db5ce0d4e6ecb1d4d5adfc1d65b715bc1 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -49,7 +49,7 @@ struct _notmuch_doc_id_set {
 #define DOCIDSET_WORD(bit) ((bit) / CHAR_BIT)
 #define DOCIDSET_BIT(bit) ((bit) % CHAR_BIT)
 
 #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. */
     notmuch_query_t *query;
 
     /* The ordered list of doc ids matched by the query. */


@@ -177,29 +177,22 @@ notmuch_query_get_sort (const notmuch_query_t *query)
     return query->sort;
 }
 
     return query->sort;
 }
 

-void
+notmuch_status_t

 notmuch_query_add_tag_exclude (notmuch_query_t *query, const char *tag)
 {
     notmuch_status_t status;
     char *term;
 
     status = _notmuch_query_ensure_parsed (query);
 notmuch_query_add_tag_exclude (notmuch_query_t *query, const char *tag)
 {
     notmuch_status_t status;
     char *term;
 
     status = _notmuch_query_ensure_parsed (query);

-    /* The following is not ideal error handling, but to avoid
-     * breaking the ABI, we can live with it for now. In particular at
-     * least in the notmuch CLI, any syntax error in the query is
-     * caught in a later call to _notmuch_query_ensure_parsed with a
-     * better error path.
-     *
-     * TODO: add status return to this function.
-     */

     if (status)
     if (status)

-       return;
+       return status;

 
     term = talloc_asprintf (query, "%s%s", _find_prefix ("tag"), tag);
     if (query->terms.count(term) != 0)
 
     term = talloc_asprintf (query, "%s%s", _find_prefix ("tag"), tag);
     if (query->terms.count(term) != 0)

-       return; /* XXX report ignoring exclude? */
+       return NOTMUCH_STATUS_IGNORED;

 
     _notmuch_string_list_append (query->exclude_terms, term);
 
     _notmuch_string_list_append (query->exclude_terms, term);

+    return NOTMUCH_STATUS_SUCCESS;

 }
 
 /* We end up having to call the destructors explicitly because we had
 }
 
 /* We end up having to call the destructors explicitly because we had