debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add_message: Rename message to message_file

Browse source 
I still don't like the name message_file at all, but we're about
to start using a notmuch_message_t in this function so we need
to do something to keep the identifiers separate for now.

Eventually, it probably makes sense to push the message-parsing
code from database.cc to message.cc.
This commit is contained in:
Carl Worth 2009-10-23 05:13:42 -07:00
parent 1ae8c41cda
commit 1ecdef59f5
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
database.cc
View file

@ -489,7 +489,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
{ {
Xapian::WritableDatabase *db = notmuch->xapian_db; Xapian::WritableDatabase *db = notmuch->xapian_db;
Xapian::Document doc; Xapian::Document doc;
notmuch_message_file_t *message; notmuch_message_file_t *message_file;
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
GPtrArray *parents, *thread_ids; GPtrArray *parents, *thread_ids;
@ -501,13 +501,13 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
time_t time_value; time_t time_value;
unsigned int i; unsigned int i;
message = notmuch_message_file_open (filename); message_file = notmuch_message_file_open (filename);
if (message == NULL) { if (message_file == NULL) {
ret = NOTMUCH_STATUS_FILE_ERROR; ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE; goto DONE;
} }
notmuch_message_file_restrict_headers (message, notmuch_message_file_restrict_headers (message_file,
"date", "date",
"from", "from",
"in-reply-to", "in-reply-to",
@ -524,16 +524,16 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
parents = g_ptr_array_new (); parents = g_ptr_array_new ();
refs = notmuch_message_file_get_header (message, "references"); refs = notmuch_message_file_get_header (message_file, "references");
parse_references (parents, refs); parse_references (parents, refs);
in_reply_to = notmuch_message_file_get_header (message, "in-reply-to"); in_reply_to = notmuch_message_file_get_header (message_file, "in-reply-to");
parse_references (parents, in_reply_to); parse_references (parents, in_reply_to);
for (i = 0; i < parents->len; i++) for (i = 0; i < parents->len; i++)
add_term (doc, "ref", (char *) g_ptr_array_index (parents, i)); add_term (doc, "ref", (char *) g_ptr_array_index (parents, i));
header = notmuch_message_file_get_header (message, "message-id"); header = notmuch_message_file_get_header (message_file, "message-id");
if (header) { if (header) {
message_id = parse_message_id (header, NULL); message_id = parse_message_id (header, NULL);
/* So the header value isn't RFC-compliant, but it's /* So the header value isn't RFC-compliant, but it's
@ -594,15 +594,15 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
g_ptr_array_free (thread_ids, TRUE); g_ptr_array_free (thread_ids, TRUE);
date = notmuch_message_file_get_header (message, "date"); date = notmuch_message_file_get_header (message_file, "date");
time_value = notmuch_parse_date (date, NULL); time_value = notmuch_parse_date (date, NULL);
doc.add_value (NOTMUCH_VALUE_DATE, doc.add_value (NOTMUCH_VALUE_DATE,
Xapian::sortable_serialise (time_value)); Xapian::sortable_serialise (time_value));
from = notmuch_message_file_get_header (message, "from"); from = notmuch_message_file_get_header (message_file, "from");
subject = notmuch_message_file_get_header (message, "subject"); subject = notmuch_message_file_get_header (message_file, "subject");
to = notmuch_message_file_get_header (message, "to"); to = notmuch_message_file_get_header (message_file, "to");
if (from == NULL && if (from == NULL &&
subject == NULL && subject == NULL &&
@ -621,8 +621,8 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
} }
DONE: DONE:
if (message) if (message_file)
notmuch_message_file_close (message); notmuch_message_file_close (message_file);
return ret; return ret;
} }