Move read-only-archive hint from "notmuch setup" to "notmuch new"

[notmuch] / notmuch-private.h

diff --git a/notmuch-private.h b/notmuch-private.h
index 8b317c2d8a3b9b59189de6982330773d6a7ff17e..1302cd30b7eea0480bc2aae11fa9ff0a276b703d 100644 (file)
--- a/notmuch-private.h
+++ b/notmuch-private.h
@@ -21,15 +21,15 @@
 #ifndef NOTMUCH_PRIVATE_H
 #define NOTMUCH_PRIVATE_H
 
 #ifndef NOTMUCH_PRIVATE_H
 #define NOTMUCH_PRIVATE_H
 

-#include "notmuch.h"
-
-NOTMUCH_BEGIN_DECLS
-

 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* For getline */
 #endif
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* For getline */
 #endif

-

 #include <stdio.h>
 #include <stdio.h>

+
+#include "notmuch.h"
+
+NOTMUCH_BEGIN_DECLS
+

 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/types.h>


@@ -40,11 +40,14 @@ NOTMUCH_BEGIN_DECLS
 #include <fcntl.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <ctype.h>

+#include <assert.h>

 
 #include <talloc.h>
 
 #include "xutil.h"
 
 
 #include <talloc.h>
 
 #include "xutil.h"
 

+#define COMPILE_TIME_ASSERT(pred) ((void)sizeof(char[1 - 2*!(pred)]))
+

 /* 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.
  */
 /* 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.
  */


@@ -67,13 +70,9 @@ NOTMUCH_BEGIN_DECLS
 #endif
 #endif
 
 #endif
 #endif
 

-/* These value numbers are chosen to be sup compatible (for now at
- * least). */
-

 typedef enum {
 typedef enum {

-    NOTMUCH_VALUE_MESSAGE_ID = 0,
-    NOTMUCH_VALUE_THREAD = 1,
-    NOTMUCH_VALUE_DATE = 2
+    NOTMUCH_VALUE_TIMESTAMP = 0,
+    NOTMUCH_VALUE_MESSAGE_ID

 } notmuch_value_t;
 
 /* Xapian (with flint backend) complains if we provide a term longer
 } notmuch_value_t;
 
 /* Xapian (with flint backend) complains if we provide a term longer


@@ -91,6 +90,7 @@ typedef enum _notmuch_private_status {
 
     /* Then add our own private values. */
     NOTMUCH_PRIVATE_STATUS_TERM_TOO_LONG,
 
     /* Then add our own private values. */
     NOTMUCH_PRIVATE_STATUS_TERM_TOO_LONG,

+    NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND,

 
     NOTMUCH_PRIVATE_STATUS_LAST_STATUS
 } notmuch_private_status_t;
 
     NOTMUCH_PRIVATE_STATUS_LAST_STATUS
 } notmuch_private_status_t;


@@ -217,15 +217,9 @@ notmuch_parse_date (const char *str, int *tz_offset);
 
 /* sha1.c */
 
 
 /* sha1.c */
 

-/* Create a hexadecimal string version of the SHA-1 digest of the
- * named file.
- *
- * This function returns a newly allocated string which the caller
- * should free() when finished.
- *
- * If any error occurs while reading the file, (permission denied,
- * file not found, etc.), this function returns NULL.
- */
+char *
+notmuch_sha1_of_string (const char *str);
+

 char *
 notmuch_sha1_of_file (const char *filename);
 
 char *
 notmuch_sha1_of_file (const char *filename);