lib: expose notmuch_message_get_database()

We've had _notmuch_message_database() internally for a while, and it's
useful.  It turns out to be useful on the other side of the library
interface as well (i'll use it later in this series for "notmuch
show"), so we expose it publicly now.

diff --git a/lib/index.cc b/lib/index.cc
index 146a89287f894552a379c7856dacaded3746105c..3f694387c36c2cc21c1509881f7596e3b7980b14 100644 (file)
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -385,7 +385,7 @@ _index_mime_part (notmuch_message_t *message,
     const char *charset;
 
     if (! part) {
     const char *charset;
 
     if (! part) {

-       _notmuch_database_log (_notmuch_message_database (message),
+       _notmuch_database_log (notmuch_message_get_database (message),

                              "Warning: Not indexing empty mime part.\n");
        return;
     }
                              "Warning: Not indexing empty mime part.\n");
        return;
     }


@@ -411,7 +411,7 @@ _index_mime_part (notmuch_message_t *message,
                                         g_mime_multipart_get_part (multipart, i));
                    continue;
                } else if (i != GMIME_MULTIPART_SIGNED_CONTENT) {
                                         g_mime_multipart_get_part (multipart, i));
                    continue;
                } else if (i != GMIME_MULTIPART_SIGNED_CONTENT) {

-                   _notmuch_database_log (_notmuch_message_database (message),
+                   _notmuch_database_log (notmuch_message_get_database (message),

                                           "Warning: Unexpected extra parts of multipart/signed. Indexing anyway.\n");
                }
            }
                                           "Warning: Unexpected extra parts of multipart/signed. Indexing anyway.\n");
                }
            }


@@ -424,7 +424,7 @@ _index_mime_part (notmuch_message_t *message,
                                               GMIME_MULTIPART_ENCRYPTED (part));
                } else {
                    if (i != GMIME_MULTIPART_ENCRYPTED_VERSION) {
                                               GMIME_MULTIPART_ENCRYPTED (part));
                } else {
                    if (i != GMIME_MULTIPART_ENCRYPTED_VERSION) {

-                       _notmuch_database_log (_notmuch_message_database (message),
+                       _notmuch_database_log (notmuch_message_get_database (message),

                                               "Warning: Unexpected extra parts of multipart/encrypted.\n");
                    }
                }
                                               "Warning: Unexpected extra parts of multipart/encrypted.\n");
                    }
                }


@@ -447,7 +447,7 @@ _index_mime_part (notmuch_message_t *message,
     }
 
     if (! (GMIME_IS_PART (part))) {
     }
 
     if (! (GMIME_IS_PART (part))) {

-       _notmuch_database_log (_notmuch_message_database (message),
+       _notmuch_database_log (notmuch_message_get_database (message),

                              "Warning: Not indexing unknown mime part: %s.\n",
                              g_type_name (G_OBJECT_TYPE (part)));
        return;
                              "Warning: Not indexing unknown mime part: %s.\n",
                              g_type_name (G_OBJECT_TYPE (part)));
        return;


@@ -528,7 +528,7 @@ _index_encrypted_mime_part (notmuch_message_t *message,
     if (!indexopts || (notmuch_indexopts_get_decrypt_policy (indexopts) == NOTMUCH_DECRYPT_FALSE))
        return;
 
     if (!indexopts || (notmuch_indexopts_get_decrypt_policy (indexopts) == NOTMUCH_DECRYPT_FALSE))
        return;
 

-    notmuch = _notmuch_message_database (message);
+    notmuch = notmuch_message_get_database (message);

 
     GMimeCryptoContext* crypto_ctx = NULL;
 #if (GMIME_MAJOR_VERSION < 3)
 
     GMimeCryptoContext* crypto_ctx = NULL;
 #if (GMIME_MAJOR_VERSION < 3)

diff --git a/lib/message-property.cc b/lib/message-property.cc
index 6525fb24469239b1a3c31f9e0a721045f5409480..210a15cca81e99d36ae8f5f7635971b3e21083c0 100644 (file)
--- a/lib/message-property.cc
+++ b/lib/message-property.cc
@@ -44,7 +44,7 @@ _notmuch_message_modify_property (notmuch_message_t *message, const char *key, c
     notmuch_status_t status;
     char *term = NULL;
 
     notmuch_status_t status;
     char *term = NULL;
 

-    status = _notmuch_database_ensure_writable (_notmuch_message_database (message));
+    status = _notmuch_database_ensure_writable (notmuch_message_get_database (message));

     if (status)
        return status;
 
     if (status)
        return status;
 


@@ -92,7 +92,7 @@ _notmuch_message_remove_all_properties (notmuch_message_t *message, const char *
     notmuch_status_t status;
     const char * term_prefix;
 
     notmuch_status_t status;
     const char * term_prefix;
 

-    status = _notmuch_database_ensure_writable (_notmuch_message_database (message));
+    status = _notmuch_database_ensure_writable (notmuch_message_get_database (message));

     if (status)
        return status;
 
     if (status)
        return status;
 

diff --git a/lib/message.cc b/lib/message.cc
index b2067076effb9981c56a16ffdbd2ca4fdbe1c849..a7e8c3cac4504dc9fec59611c7c0dcdf5539dbf2 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -268,7 +268,7 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
 
        doc_id = _notmuch_database_generate_doc_id (notmuch);
     } catch (const Xapian::Error &error) {
 
        doc_id = _notmuch_database_generate_doc_id (notmuch);
     } catch (const Xapian::Error &error) {

-       _notmuch_database_log(_notmuch_message_database (message), "A Xapian exception occurred creating message: %s\n",
+       _notmuch_database_log(notmuch_message_get_database (message), "A Xapian exception occurred creating message: %s\n",

                 error.get_msg().c_str());
        notmuch->exception_reported = true;
        *status_ret = NOTMUCH_PRIVATE_STATUS_XAPIAN_EXCEPTION;
                 error.get_msg().c_str());
        notmuch->exception_reported = true;
        *status_ret = NOTMUCH_PRIVATE_STATUS_XAPIAN_EXCEPTION;


@@ -512,7 +512,7 @@ _notmuch_message_ensure_message_file (notmuch_message_t *message)
        return;
 
     message->message_file = _notmuch_message_file_open_ctx (
        return;
 
     message->message_file = _notmuch_message_file_open_ctx (

-       _notmuch_message_database (message), message, filename);
+       notmuch_message_get_database (message), message, filename);

 }
 
 const char *
 }
 
 const char *


@@ -542,7 +542,7 @@ notmuch_message_get_header (notmuch_message_t *message, const char *header)
                return talloc_strdup (message, value.c_str ());
 
        } catch (Xapian::Error &error) {
                return talloc_strdup (message, value.c_str ());
 
        } catch (Xapian::Error &error) {

-           _notmuch_database_log(_notmuch_message_database (message), "A Xapian exception occurred when reading header: %s\n",
+           _notmuch_database_log(notmuch_message_get_database (message), "A Xapian exception occurred when reading header: %s\n",

                     error.get_msg().c_str());
            message->notmuch->exception_reported = true;
            return NULL;
                     error.get_msg().c_str());
            message->notmuch->exception_reported = true;
            return NULL;


@@ -663,7 +663,7 @@ _notmuch_message_remove_indexed_terms (notmuch_message_t *message)
            notmuch_database_t *notmuch = message->notmuch;
 
            if (!notmuch->exception_reported) {
            notmuch_database_t *notmuch = message->notmuch;
 
            if (!notmuch->exception_reported) {

-               _notmuch_database_log(_notmuch_message_database (message), "A Xapian exception occurred creating message: %s\n",
+               _notmuch_database_log(notmuch_message_get_database (message), "A Xapian exception occurred creating message: %s\n",

                                      error.get_msg().c_str());
                notmuch->exception_reported = true;
            }
                                      error.get_msg().c_str());
                notmuch->exception_reported = true;
            }


@@ -1059,7 +1059,7 @@ notmuch_message_get_date (notmuch_message_t *message)
     try {
        value = message->doc.get_value (NOTMUCH_VALUE_TIMESTAMP);
     } catch (Xapian::Error &error) {
     try {
        value = message->doc.get_value (NOTMUCH_VALUE_TIMESTAMP);
     } catch (Xapian::Error &error) {

-       _notmuch_database_log(_notmuch_message_database (message), "A Xapian exception occurred when reading date: %s\n",
+       _notmuch_database_log(notmuch_message_get_database (message), "A Xapian exception occurred when reading date: %s\n",

                 error.get_msg().c_str());
        message->notmuch->exception_reported = true;
        return 0;
                 error.get_msg().c_str());
        message->notmuch->exception_reported = true;
        return 0;


@@ -1925,7 +1925,7 @@ notmuch_message_destroy (notmuch_message_t *message)
 }
 
 notmuch_database_t *
 }
 
 notmuch_database_t *

-_notmuch_message_database (notmuch_message_t *message)
+notmuch_message_get_database (notmuch_message_t *message)

 {
     return message->notmuch;
 }
 {
     return message->notmuch;
 }


@@ -2002,7 +2002,7 @@ notmuch_message_reindex (notmuch_message_t *message,
     /* strdup it because the metadata may be invalidated */
     orig_thread_id = talloc_strdup (message, orig_thread_id);
 
     /* strdup it because the metadata may be invalidated */
     orig_thread_id = talloc_strdup (message, orig_thread_id);
 

-    notmuch = _notmuch_message_database (message);
+    notmuch = notmuch_message_get_database (message);

 
     ret = _notmuch_database_ensure_writable (notmuch);
     if (ret)
 
     ret = _notmuch_database_ensure_writable (notmuch);
     if (ret)

diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 4598577f3bc42e99a1e3bb4c120371de0df4becb..3764a6a996fd64448d99446d38b472cf3084f0d7 100644 (file)
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -532,8 +532,6 @@ _notmuch_message_id_parse (void *ctx, const char *message_id, const char **next)
 void
 _notmuch_message_add_reply (notmuch_message_t *message,
                            notmuch_message_t *reply);
 void
 _notmuch_message_add_reply (notmuch_message_t *message,
                            notmuch_message_t *reply);

-notmuch_database_t *
-_notmuch_message_database (notmuch_message_t *message);

 
 void
 _notmuch_message_remove_unprefixed_terms (notmuch_message_t *message);
 
 void
 _notmuch_message_remove_unprefixed_terms (notmuch_message_t *message);

diff --git a/lib/notmuch.h b/lib/notmuch.h
index 4db28a051e9f8f10c64045c617faf5e0914b05ba..06842517ddf4f986a03b46370b44079438deb597 100644 (file)
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -1345,6 +1345,14 @@ notmuch_messages_destroy (notmuch_messages_t *messages);
 notmuch_tags_t *
 notmuch_messages_collect_tags (notmuch_messages_t *messages);
 
 notmuch_tags_t *
 notmuch_messages_collect_tags (notmuch_messages_t *messages);
 

+/**
+ * Get the database associated with this message.
+ *
+ * @since libnotmuch 5.2 (notmuch 0.27)
+ */
+notmuch_database_t *
+notmuch_message_get_database (notmuch_message_t *message);
+

 /**
  * Get the message ID of 'message'.
  *
 /**
  * Get the message ID of 'message'.
  *