notmuch_message_get_message_id: Fix to cache result

[notmuch] / notmuch-private.h

diff --git a/notmuch-private.h b/notmuch-private.h
index 2bf6beb456615074b76da2f62cfbaec5cd824c65..e64e92ffae44e4e2050fbf992599153b8b087401 100644 (file)
--- a/notmuch-private.h
+++ b/notmuch-private.h
@@ -43,6 +43,7 @@ NOTMUCH_BEGIN_DECLS
 
 #include <talloc.h>
 
+#include "xutil.h"
 
 /* Thanks to Andrew Tridgell's (SAMBA's) talloc for this definition of
  * unlikely. The talloc source code comes to us via the GNU LGPL v. 3.
@@ -75,29 +76,22 @@ typedef enum {
     NOTMUCH_VALUE_DATE = 2
 } notmuch_value_t;
 
-/* xutil.c */
-void *
-xcalloc (size_t nmemb, size_t size);
-
-void *
-xmalloc (size_t size);
-
-void *
-xrealloc (void *ptrr, size_t size);
-
-char *
-xstrdup (const char *s);
-
-char *
-xstrndup (const char *s, size_t n);
+/* Xapian (with flint backend) complains if we provide a term longer
+ * than this, but I haven't yet found a way to query the limit
+ * programmatically. */
+#define NOTMUCH_TERM_MAX 245
 
 /* message.cc */
 
 notmuch_message_t *
-_notmuch_message_create (notmuch_results_t *owner,
+_notmuch_message_create (const void *talloc_owner,
                         notmuch_database_t *notmuch,
                         unsigned int doc_id);
 
+/* Lookup a prefix value by name. */
+const char *
+_find_prefix (const char *name);
+
 /* message-file.c */
 
 /* XXX: I haven't decided yet whether these will actually get exported