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

notmuch-index-message: Use more meaningful variable names.

Browse source 
The abuse of the generic "value" name was getting very hard to read.
This commit is contained in:
Carl Worth 2009-10-14 09:57:59 -07:00
parent 7d1227c4a8
commit ed320cb45b
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
notmuch-index-message.cc
View file

@ -390,7 +390,8 @@ index_file (Xapian::WritableDatabase db,
FILE *file; FILE *file;
const char *value, *from, *thread_id; const char *subject, *refs, *in_reply_to, *from;
const char *message_id, *thread_id;
time_t time; time_t time;
struct tm gm_time_tm; struct tm gm_time_tm;
@ -425,21 +426,22 @@ index_file (Xapian::WritableDatabase db,
addresses = g_mime_message_get_all_recipients (message); addresses = g_mime_message_get_all_recipients (message);
gen_terms_address_names (term_gen, addresses, "to_name"); gen_terms_address_names (term_gen, addresses, "to_name");
value = g_mime_message_get_subject (message); subject = g_mime_message_get_subject (message);
value = skip_re_in_subject (value); subject = skip_re_in_subject (subject);
gen_terms (term_gen, "subject", value); gen_terms (term_gen, "subject", subject);
gen_terms (term_gen, "body", value); gen_terms (term_gen, "body", subject);
gen_terms_body (term_gen, filename, gen_terms_body (term_gen, filename,
g_mime_parser_get_headers_end (parser)); g_mime_parser_get_headers_end (parser));
parents = g_ptr_array_new (); parents = g_ptr_array_new ();
value = g_mime_object_get_header (GMIME_OBJECT (message), "references"); refs = g_mime_object_get_header (GMIME_OBJECT (message), "references");
parse_references (parents, value); parse_references (parents, refs);
value = g_mime_object_get_header (GMIME_OBJECT (message), "in-reply-to"); in_reply_to = g_mime_object_get_header (GMIME_OBJECT (message),
parse_references (parents, value); "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));
@ -476,9 +478,9 @@ index_file (Xapian::WritableDatabase db,
add_term (doc, "type", "mail"); add_term (doc, "type", "mail");
add_term (doc, "source_id", "1"); add_term (doc, "source_id", "1");
value = g_mime_message_get_message_id (message); message_id = g_mime_message_get_message_id (message);
add_term (doc, "msgid", value); add_term (doc, "msgid", message_id);
doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, value); doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, message_id);
if (thread_id) { if (thread_id) {
add_term (doc, "thread", thread_id); add_term (doc, "thread", thread_id);
@ -486,8 +488,8 @@ index_file (Xapian::WritableDatabase db,
free ((void *) thread_id); free ((void *) thread_id);
} else { } else {
/* If not referenced thread, use the message ID */ /* If not referenced thread, use the message ID */
add_term (doc, "thread", value); add_term (doc, "thread", message_id);
doc.add_value (NOTMUCH_VALUE_THREAD, value); doc.add_value (NOTMUCH_VALUE_THREAD, message_id);
} }
doc.add_value (NOTMUCH_VALUE_DATE, Xapian::sortable_serialise (time)); doc.add_value (NOTMUCH_VALUE_DATE, Xapian::sortable_serialise (time));