Merge remote-tracking branch 'origin/debian/bullseye' into release

[notmuch] / lib / database-private.h

diff --git a/lib/database-private.h b/lib/database-private.h
index 2d220811c4a092930ed575bb60ae3121df5b50bf..0d12ec1efde57b4862f1001facdbfafe3dec54cd 100644 (file)
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -189,7 +189,11 @@ operator& (notmuch_field_flag_t a, notmuch_field_flag_t b)
 struct _notmuch_database {
     bool exception_reported;
 
-    char *path;
+    /* Path to actual database */
+    const char *xapian_path;
+
+    /* Path to config loaded, if any */
+    const char *config_path;
 
     int atomic_nesting;
     /* true if changes have been made in this atomic section */
@@ -228,6 +232,9 @@ struct _notmuch_database {
      * here, but at least they are small */
     notmuch_string_map_t *user_prefix;
     notmuch_string_map_t *user_header;
+
+    /* Cached and possibly overridden configuration */
+    notmuch_string_map_t *config;
 };
 
 /* Prior to database version 3, features were implied by the database
@@ -277,4 +284,11 @@ _notmuch_database_parse_features (const void *ctx, const char *features, unsigne
 char *
 _notmuch_database_print_features (const void *ctx, unsigned int features);
 
+/* prefix.cc */
+notmuch_status_t
+_notmuch_database_setup_standard_query_fields (notmuch_database_t *notmuch);
+
+notmuch_status_t
+_notmuch_database_setup_user_query_fields (notmuch_database_t *notmuch);
+
 #endif