3 files changed, 5 insertions, 16 deletions
diff --git a/notmuch.c b/notmuch.c
index 43af75d2..6be2881c 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -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;
diff --git a/notmuch.h b/notmuch.h
index 10067d3f..df432bcc 100644
--- a/notmuch.h
+++ b/notmuch.h
@@ -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,
diff --git a/query.cc b/query.cc
index 2a1815a7..50223b02 100644
--- a/query.cc
+++ b/query.cc
@@ -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);
 	}