Avoid database corruption by not adding partially-constructed mail documents.

[notmuch] / lib / database-private.h

diff --git a/lib/database-private.h b/lib/database-private.h
index 5bb6e86c735fd80d53efcc801f4a4697cba5bd31..bd72f670092b0846501e425de44eb69f91a13869 100644 (file)
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -21,6 +21,15 @@
 #ifndef NOTMUCH_DATABASE_PRIVATE_H
 #define NOTMUCH_DATABASE_PRIVATE_H
 
+/* According to WG14/N1124, a C++ implementation won't provide us a
+ * macro like PRIx64 (which gives a printf format string for
+ * formatting a uint64_t as hexadecimal) unless we define
+ * __STDC_FORMAT_MACROS before including inttypes.h. That's annoying,
+ * but there it is.
+ */
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+
 #include "notmuch-private.h"
 
 #include <xapian.h>
@@ -34,6 +43,7 @@ struct _notmuch_database {
     notmuch_database_mode_t mode;
     Xapian::Database *xapian_db;
 
+    unsigned int last_doc_id;
     uint64_t last_thread_id;
 
     Xapian::QueryParser *query_parser;