debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

query: Remove the magic NOTMUCH_QUERY_ALL

Browse source 
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.
This commit is contained in:
Carl Worth 2009-10-20 22:40:37 -07:00
parent aad13c3ac9
commit 6519aff957
3 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
notmuch.c
View file

@ -398,7 +398,7 @@ dump_command (int argc, char *argv[])
goto DONE; goto DONE;
} }
query = notmuch_query_create (notmuch, NOTMUCH_QUERY_ALL); query = notmuch_query_create (notmuch, "");
if (query == NULL) { if (query == NULL) {
fprintf (stderr, "Out of memory\n"); fprintf (stderr, "Out of memory\n");
ret = 1; ret = 1;

9
notmuch.h
View file

@ -174,9 +174,8 @@ notmuch_database_add_message (notmuch_database_t *database,
* *
* http://xapian.org/docs/queryparser.html * http://xapian.org/docs/queryparser.html
* *
* As a special case, passing a value of NOTMUCH_QUERY_ALL for the * As a special case, passing a length-zero string, (that is ""), will
* query string will result in a query that returns all messages in * result in a query that returns all messages in the database.
* the database.
* *
* See notmuch_query_set_sort for controlling the order of results and * See notmuch_query_set_sort for controlling the order of results and
* notmuch_query_search to actually execute the query. * notmuch_query_search to actually execute the query.
@ -190,10 +189,6 @@ notmuch_query_t *
notmuch_query_create (notmuch_database_t *database, notmuch_query_create (notmuch_database_t *database,
const char *query_string); 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 */ /* Sort values for notmuch_query_set_sort */
typedef enum { typedef enum {
NOTMUCH_SORT_DATE_OLDEST_FIRST, NOTMUCH_SORT_DATE_OLDEST_FIRST,

10
query.cc
View file

@ -23,8 +23,6 @@
#include <xapian.h> #include <xapian.h>
const char *NOTMUCH_QUERY_ALL = "";
struct _notmuch_query { struct _notmuch_query {
notmuch_database_t *notmuch; notmuch_database_t *notmuch;
const char *query_string; const char *query_string;
@ -49,11 +47,7 @@ notmuch_query_create (notmuch_database_t *notmuch,
query->notmuch = notmuch; query->notmuch = notmuch;
/* Special-case NOTMUCH_QUERY_ALL so we see it and not a copy. */ query->query_string = talloc_strdup (query, query_string);
if (query_string == NOTMUCH_QUERY_ALL)
query->query_string = query_string;
else
query->query_string = talloc_strdup (query, query_string);
query->sort = NOTMUCH_SORT_DATE_OLDEST_FIRST; query->sort = NOTMUCH_SORT_DATE_OLDEST_FIRST;
@ -91,7 +85,7 @@ notmuch_query_search (notmuch_query_t *query)
return NULL; return NULL;
try { 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"); fprintf (stderr, "Error: Arbitrary search strings are not supported yet. Come back soon!\n");
exit (1); exit (1);
} }