diff options
author | Carl Worth <cworth@cworth.org> | 2009-10-20 22:40:37 -0700 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2009-10-20 22:40:37 -0700 |
commit | 6519aff957df7a69d86ed9a00707c911d60259f6 (patch) | |
tree | 7f85fc1fb047fedcafadc013022a794f363fd6d4 | |
parent | aad13c3ac947a42b3e0a1923c44a927feea827f5 (diff) |
query: Remove the magic NOTMUCH_QUERY_ALL
Using the address of a static char* was clever, but really
unnecessary. An empty string is much less magic, and even
easier to understand as the way to query everything from
the database.
-rw-r--r-- | notmuch.c | 2 | ||||
-rw-r--r-- | notmuch.h | 9 | ||||
-rw-r--r-- | query.cc | 10 |
3 files changed, 5 insertions, 16 deletions
@@ -398,7 +398,7 @@ dump_command (int argc, char *argv[]) goto DONE; } - query = notmuch_query_create (notmuch, NOTMUCH_QUERY_ALL); + query = notmuch_query_create (notmuch, ""); if (query == NULL) { fprintf (stderr, "Out of memory\n"); ret = 1; @@ -174,9 +174,8 @@ notmuch_database_add_message (notmuch_database_t *database, * * http://xapian.org/docs/queryparser.html * - * As a special case, passing a value of NOTMUCH_QUERY_ALL for the - * query string will result in a query that returns all messages in - * the database. + * As a special case, passing a length-zero string, (that is ""), will + * result in a query that returns all messages in the database. * * See notmuch_query_set_sort for controlling the order of results and * notmuch_query_search to actually execute the query. @@ -190,10 +189,6 @@ notmuch_query_t * notmuch_query_create (notmuch_database_t *database, const char *query_string); -/* Special value to cause notmuch_query_create to return all - * messages. */ -extern const char *NOTMUCH_QUERY_ALL; - /* Sort values for notmuch_query_set_sort */ typedef enum { NOTMUCH_SORT_DATE_OLDEST_FIRST, @@ -23,8 +23,6 @@ #include <xapian.h> -const char *NOTMUCH_QUERY_ALL = ""; - struct _notmuch_query { notmuch_database_t *notmuch; const char *query_string; @@ -49,11 +47,7 @@ notmuch_query_create (notmuch_database_t *notmuch, query->notmuch = notmuch; - /* Special-case NOTMUCH_QUERY_ALL so we see it and not a copy. */ - if (query_string == NOTMUCH_QUERY_ALL) - query->query_string = query_string; - else - query->query_string = talloc_strdup (query, query_string); + query->query_string = talloc_strdup (query, query_string); query->sort = NOTMUCH_SORT_DATE_OLDEST_FIRST; @@ -91,7 +85,7 @@ notmuch_query_search (notmuch_query_t *query) return NULL; try { - if (query->query_string != NOTMUCH_QUERY_ALL) { + if (strlen (query->query_string)) { fprintf (stderr, "Error: Arbitrary search strings are not supported yet. Come back soon!\n"); exit (1); } |