X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-private.h;h=c60c4d89d0c297a6bdb56442566628f4590f1c25;hb=17b3c214ea123a0e03c5bfff8fc3826976f5ad64;hp=449aff7143e14023ee0b97c9a27824aceeb8b52d;hpb=371091139abb00e0eb6b17cd19311e2a30fd7470;p=notmuch

diff --git a/notmuch-private.h b/notmuch-private.h
index 449aff71..c60c4d89 100644
--- a/notmuch-private.h
+++ b/notmuch-private.h
@@ -23,7 +23,9 @@
 
 #include "notmuch.h"
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* For getline */
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,29 +41,55 @@
 
 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
+
+/* These value numbers are chosen to be sup compatible (for now at
+ * least). */
 
-char *
-xstrdup (const char *s);
+typedef enum {
+    NOTMUCH_VALUE_MESSAGE_ID = 0,
+    NOTMUCH_VALUE_THREAD = 1,
+    NOTMUCH_VALUE_DATE = 2
+} notmuch_value_t;
 
-char *
-xstrndup (const char *s, size_t n);
+/* message.cc */
 
-/* message.c */
+notmuch_message_t *
+_notmuch_message_create (notmuch_results_t *owner,
+			 notmuch_database_t *notmuch,
+			 unsigned int doc_id);
+
+/* message-file.c */
 
 /* XXX: I haven't decided yet whether these will actually get exported
  * into the public interface in notmuch.h
  */
 
-typedef struct _notmuch_message notmuch_message_t;
+typedef struct _notmuch_message_file notmuch_message_file_t;
 
 /* Open a file containing a single email message.
  *
@@ -69,12 +97,12 @@ typedef struct _notmuch_message notmuch_message_t;
  *
  * Returns NULL if any error occurs.
  */
-notmuch_message_t *
-notmuch_message_open (const char *filename);
+notmuch_message_file_t *
+notmuch_message_file_open (const char *filename);
 
 /* Close a notmuch message preivously opened with notmuch_message_open. */
 void
-notmuch_message_close (notmuch_message_t *message);
+notmuch_message_file_close (notmuch_message_file_t *message);
 
 /* Restrict 'message' to only save the named headers.
  *
@@ -93,12 +121,12 @@ notmuch_message_close (notmuch_message_t *message);
  * returned even if that header exists in the actual message.
  */
 void
-notmuch_message_restrict_headers (notmuch_message_t *message, ...);
+notmuch_message_file_restrict_headers (notmuch_message_file_t *message, ...);
 
 /* Identical to notmuch_message_restrict_headers but accepting a va_list. */
 void
-notmuch_message_restrict_headersv (notmuch_message_t *message,
-				   va_list va_headers);
+notmuch_message_file_restrict_headersv (notmuch_message_file_t *message,
+					va_list va_headers);
 
 /* Get the value of the specified header from the message.
  *
@@ -112,8 +140,8 @@ notmuch_message_restrict_headersv (notmuch_message_t *message,
  * 'header'.
  */
 const char *
-notmuch_message_get_header (notmuch_message_t *message,
-			    const char *header);
+notmuch_message_file_get_header (notmuch_message_file_t *message,
+				 const char *header);
 
 /* date.c */