X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=database.cc;h=3cbab9f067d64b708f2328315eb02ffce451293b;hp=cd057846455605c2a01f270f84efa8731d6dcbb1;hb=70f9d0ad428312397ee7ad157b520824d66d0d0e;hpb=be9e3ee3132457ea5936bd1225294bdfe3949a4c diff --git a/database.cc b/database.cc index cd057846..3cbab9f0 100644 --- a/database.cc +++ b/database.cc @@ -152,6 +152,8 @@ notmuch_status_to_string (notmuch_status_t status) switch (status) { case NOTMUCH_STATUS_SUCCESS: return "No error occurred"; + case NOTMUCH_STATUS_OUT_OF_MEMORY: + return "Out of memory"; case NOTMUCH_STATUS_XAPIAN_EXCEPTION: return "A Xapian exception occurred"; case NOTMUCH_STATUS_FILE_ERROR: @@ -170,29 +172,6 @@ notmuch_status_to_string (notmuch_status_t status) } } -/* XXX: We should drop this function and convert all callers to call - * _notmuch_message_add_term instead. */ -static void -add_term (Xapian::Document doc, - const char *prefix_name, - const char *value) -{ - const char *prefix; - char *term; - - if (value == NULL) - return; - - prefix = _find_prefix (prefix_name); - - term = g_strdup_printf ("%s%s", prefix, value); - - if (strlen (term) <= NOTMUCH_TERM_MAX) - doc.add_term (term); - - g_free (term); -} - static void find_doc_ids (notmuch_database_t *notmuch, const char *prefix_name, @@ -519,7 +498,7 @@ notmuch_database_get_path (notmuch_database_t *notmuch) return notmuch->path; } -notmuch_private_status_t +static notmuch_private_status_t find_timestamp_document (notmuch_database_t *notmuch, const char *db_key, Xapian::Document *doc, unsigned int *doc_id) { @@ -623,7 +602,7 @@ notmuch_database_get_timestamp (notmuch_database_t *notmuch, const char *key) * * Otherwise, returns a newly talloced string belonging to 'ctx'. */ -const char * +static const char * _resolve_message_id_to_thread_id (notmuch_database_t *notmuch, void *ctx, const char *message_id)