X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fmessage.cc;h=63b216b638127c3ccc1b92bfdfc5d89cbed5c753;hb=cc180507b03d9826c92d48ee91dbd9bb5f15cd56;hp=42d56acb10e4ae80a3f36e92c2f6c644b03afd43;hpb=9d6f4641d17a6100cb8d96bc1e09d3d4999c34f3;p=notmuch

diff --git a/lib/message.cc b/lib/message.cc
index 42d56acb..63b216b6 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -68,7 +68,7 @@ struct maildir_flag_tag {
 };
 
 /* ASCII ordered table of Maildir flags and associated tags */
-static struct maildir_flag_tag flag2tag[] = {
+static const struct maildir_flag_tag flag2tag[] = {
     { 'D', "draft",   false },
     { 'F', "flagged", false },
     { 'P', "passed",  false },
@@ -288,7 +288,7 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
 
 	doc_id = _notmuch_database_generate_doc_id (notmuch);
     } catch (const Xapian::Error &error) {
-	_notmuch_database_log (notmuch_message_get_database (message),
+	_notmuch_database_log (notmuch,
 			       "A Xapian exception occurred creating message: %s\n",
 			       error.get_msg ().c_str ());
 	notmuch->exception_reported = true;
@@ -742,7 +742,7 @@ _notmuch_message_remove_terms (notmuch_message_t *message, const char *prefix)
  * properties, along with any automatic tags*/
 /* According to Xapian API docs, none of these calls throw
  * exceptions */
-notmuch_private_status_t
+static notmuch_private_status_t
 _notmuch_message_remove_indexed_terms (notmuch_message_t *message)
 {
     Xapian::TermIterator i;