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 /query.cc | |
| 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.
Diffstat (limited to 'query.cc')
| -rw-r--r-- | query.cc | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -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); } |
