notmuch_message_get_message_id: Fix to cache result

[notmuch] / notmuch-private.h

diff --git a/notmuch-private.h b/notmuch-private.h
index 0c20a3c47320bc7275aaaabfe73156be2bdb2d5b..e64e92ffae44e4e2050fbf992599153b8b087401 100644 (file)
--- a/notmuch-private.h
+++ b/notmuch-private.h
@@ -41,21 +41,56 @@
 
 NOTMUCH_BEGIN_DECLS
 
-/* xutil.c */
-void *
-xcalloc (size_t nmemb, size_t size);
+#include <talloc.h>
 
-void *
-xmalloc (size_t size);
+#include "xutil.h"
 
-void *
-xrealloc (void *ptrr, size_t size);
+/* 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.
+ */
+/* these macros gain us a few percent of speed on gcc */
+#if (__GNUC__ >= 3)
+/* the strange !! is to ensure that __builtin_expect() takes either 0 or 1
+   as its first argument */
+#ifndef likely
+#define likely(x)   __builtin_expect(!!(x), 1)
+#endif
+#ifndef unlikely
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#endif
+#else
+#ifndef likely
+#define likely(x) (x)
+#endif
+#ifndef unlikely
+#define unlikely(x) (x)
+#endif
+#endif
 
-char *
-xstrdup (const char *s);
+/* These value numbers are chosen to be sup compatible (for now at
+ * least). */
 
-char *
-xstrndup (const char *s, size_t n);
+typedef enum {
+    NOTMUCH_VALUE_MESSAGE_ID = 0,
+    NOTMUCH_VALUE_THREAD = 1,
+    NOTMUCH_VALUE_DATE = 2
+} notmuch_value_t;
+
+/* 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 (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 */