X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=message.cc;h=78b6fed6bb2d8725e52f3637088fd513f5e0a748;hp=65e5ad78a269b6da86ef5a3b7c289871d8096712;hb=2a9b4fce7ce9dc1cb89a7581bc1360fd4bfcdf99;hpb=ce5d78296251b529838df0dbd4dc3b9a90030924

diff --git a/message.cc b/message.cc
index 65e5ad78..78b6fed6 100644
--- a/message.cc
+++ b/message.cc
@@ -48,59 +48,6 @@ typedef struct _thread_id {
     char str[NOTMUCH_THREAD_ID_DIGITS + 1];
 } thread_id_t;
 
-#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
-
-/* These prefix values are specifically chosen to be compatible
- * with sup, (http://sup.rubyforge.org), written by
- * William Morgan <wmorgan-sup@masanjin.net>, and released
- * under the GNU GPL v2.
- */
-
-typedef struct {
-    const char *name;
-    const char *prefix;
-} prefix_t;
-
-prefix_t NORMAL_PREFIX[] = {
-    { "subject", "S" },
-    { "body", "B" },
-    { "from_name", "FN" },
-    { "to_name", "TN" },
-    { "name", "N" },
-    { "attachment", "A" }
-};
-
-prefix_t BOOLEAN_PREFIX[] = {
-    { "type", "K" },
-    { "from_email", "FE" },
-    { "to_email", "TE" },
-    { "email", "E" },
-    { "date", "D" },
-    { "label", "L" },
-    { "tag", "L" },
-    { "source_id", "I" },
-    { "attachment_extension", "O" },
-    { "msgid", "Q" },
-    { "thread", "H" },
-    { "ref", "R" }
-};
-
-const char *
-_find_prefix (const char *name)
-{
-    unsigned int i;
-
-    for (i = 0; i < ARRAY_SIZE (NORMAL_PREFIX); i++)
-	if (strcmp (name, NORMAL_PREFIX[i].name) == 0)
-	    return NORMAL_PREFIX[i].prefix;
-
-    for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX); i++)
-	if (strcmp (name, BOOLEAN_PREFIX[i].name) == 0)
-	    return BOOLEAN_PREFIX[i].prefix;
-
-    return "";
-}
-
 /* We end up having to call the destructor explicitly because we had
  * to use "placement new" in order to initialize C++ objects within a
  * block that we allocated with talloc. So C++ is making talloc
@@ -193,7 +140,7 @@ _notmuch_message_create_for_message_id (const void *talloc_owner,
 	return talloc_steal (talloc_owner, message);
 
     term = talloc_asprintf (NULL, "%s%s",
-			    _find_prefix ("msgid"), message_id);
+			    _find_prefix ("id"), message_id);
     doc.add_term (term);
     talloc_free (term);
 
@@ -213,7 +160,7 @@ notmuch_message_get_message_id (notmuch_message_t *message)
 	return message->message_id;
 
     i = message->doc.termlist_begin ();
-    i.skip_to (_find_prefix ("msgid"));
+    i.skip_to (_find_prefix ("id"));
 
     if (i == message->doc.termlist_end ()) {
 	fprintf (stderr, "Internal error: Message with document ID of %d has no message ID.\n",
@@ -522,7 +469,7 @@ notmuch_tags_has_more (notmuch_tags_t *tags)
 	return FALSE;
 
     s = *tags->iterator;
-    if (s.size () && s[0] == 'L')
+    if (! s.empty () && s[0] == 'L')
 	return TRUE;
     else
 	return FALSE;