X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-private.h;h=bb3f62c1aa32e5eadf05c216de14a55e94d54284;hp=2bf6beb456615074b76da2f62cfbaec5cd824c65;hb=302d54834d090d7e62377883f36dc709c95e5673;hpb=65baa4f4e7fc401e5af742b491a3bc0784f2cdf7

diff --git a/notmuch-private.h b/notmuch-private.h
index 2bf6beb4..bb3f62c1 100644
--- a/notmuch-private.h
+++ b/notmuch-private.h
@@ -23,6 +23,8 @@
 
 #include "notmuch.h"
 
+NOTMUCH_BEGIN_DECLS
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* For getline */
 #endif
@@ -39,10 +41,9 @@
 #include <unistd.h>
 #include <ctype.h>
 
-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,50 @@ typedef enum {
     NOTMUCH_VALUE_DATE = 2
 } notmuch_value_t;
 
-/* xutil.c */
-void *
-xcalloc (size_t nmemb, size_t size);
-
-void *
-xmalloc (size_t size);
+/* 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
 
-void *
-xrealloc (void *ptrr, size_t size);
+typedef enum _notmuch_private_status {
+    /* First, copy all the public status values. */
+    NOTMUCH_PRIVATE_STATUS_SUCCESS = NOTMUCH_STATUS_SUCCESS,
+    NOTMUCH_PRIVATE_STATUS_XAPIAN_EXCEPTION = NOTMUCH_STATUS_XAPIAN_EXCEPTION,
+    NOTMUCH_PRIVATE_STATUS_FILE_NOT_EMAIL = NOTMUCH_STATUS_FILE_NOT_EMAIL,
+    NOTMUCH_PRIVATE_STATUS_NULL_POINTER = NOTMUCH_STATUS_NULL_POINTER,
+    NOTMUCH_PRIVATE_STATUS_TAG_TOO_LONG = NOTMUCH_STATUS_TAG_TOO_LONG,
 
-char *
-xstrdup (const char *s);
+    /* Then add our own private values. */
+    NOTMUCH_PRIVATE_STATUS_TERM_TOO_LONG,
 
-char *
-xstrndup (const char *s, size_t n);
+    NOTMUCH_PRIVATE_STATUS_LAST_STATUS
+} notmuch_private_status_t;
 
 /* 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.
+ *
+ * XXX: This should really be static inside of message.cc, and we can
+ * do that once we convert database.cc to use the
+ * _notmuch_message_add/remove_term functions. */
+const char *
+_find_prefix (const char *name);
+
+notmuch_private_status_t
+_notmuch_message_add_term (notmuch_message_t *message,
+			   const char *prefix_name,
+			   const char *value);
+
+notmuch_private_status_t
+_notmuch_message_remove_term (notmuch_message_t *message,
+			      const char *prefix_name,
+			      const char *value);
+
 /* message-file.c */
 
 /* XXX: I haven't decided yet whether these will actually get exported