Move find_prefix function from database.cc to message.cc

[notmuch] / notmuch-private.h

diff --git a/notmuch-private.h b/notmuch-private.h
index 728c1a676debc9e41a92298cd22d1216119282d3..384cc2de50e6cbaf2028c8ac5546f906a8682366 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.
@@ -66,21 +67,17 @@ NOTMUCH_BEGIN_DECLS
 #endif
 #endif
 
-/* xutil.c */
-void *
-xcalloc (size_t nmemb, size_t size);
+/* These value numbers are chosen to be sup compatible (for now at
+ * least). */
 
-void *
-xmalloc (size_t size);
+typedef enum {
+    NOTMUCH_VALUE_MESSAGE_ID = 0,
+    NOTMUCH_VALUE_THREAD = 1,
+    NOTMUCH_VALUE_DATE = 2
+} notmuch_value_t;
 
-void *
-xrealloc (void *ptrr, size_t size);
-
-char *
-xstrdup (const char *s);
-
-char *
-xstrndup (const char *s, size_t n);
+/* Xapian complains if we provide a term longer than this. */
+#define NOTMUCH_MAX_TERM 245
 
 /* message.cc */
 
@@ -89,6 +86,10 @@ _notmuch_message_create (notmuch_results_t *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