util: move strcase_equal and strcase_hash to util

[notmuch] / lib / message-file.c

diff --git a/lib/message-file.c b/lib/message-file.c
index 483ba1e98a1fd080f753f56e8aeae90ad1ff64e0..ee305202fffa63f0e1a1d024c738a1d69a39ebb4 100644 (file)
--- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -37,27 +37,6 @@ struct _notmuch_message_file {
     GMimeMessage *message;
 };
 
-static int
-strcase_equal (const void *a, const void *b)
-{
-    return strcasecmp (a, b) == 0;
-}
-
-static unsigned int
-strcase_hash (const void *ptr)
-{
-    const char *s = ptr;
-
-    /* This is the djb2 hash. */
-    unsigned int hash = 5381;
-    while (s && *s) {
-       hash = ((hash << 5) + hash) + tolower (*s);
-       s++;
-    }
-
-    return hash;
-}
-
 static int
 _notmuch_message_file_destructor (notmuch_message_file_t *message)
 {
@@ -76,7 +55,8 @@ _notmuch_message_file_destructor (notmuch_message_file_t *message)
 /* Create a new notmuch_message_file_t for 'filename' with 'ctx' as
  * the talloc owner. */
 notmuch_message_file_t *
-_notmuch_message_file_open_ctx (void *ctx, const char *filename)
+_notmuch_message_file_open_ctx (notmuch_database_t *notmuch,
+                               void *ctx, const char *filename)
 {
     notmuch_message_file_t *message;
 
@@ -98,20 +78,22 @@ _notmuch_message_file_open_ctx (void *ctx, const char *filename)
     return message;
 
   FAIL:
-    fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));
-    notmuch_message_file_close (message);
+    _notmuch_database_log (notmuch, "Error opening %s: %s\n",
+                         filename, strerror (errno));
+    _notmuch_message_file_close (message);
 
     return NULL;
 }
 
 notmuch_message_file_t *
-notmuch_message_file_open (const char *filename)
+_notmuch_message_file_open (notmuch_database_t *notmuch,
+                           const char *filename)
 {
-    return _notmuch_message_file_open_ctx (NULL, filename);
+    return _notmuch_message_file_open_ctx (notmuch, NULL, filename);
 }
 
 void
-notmuch_message_file_close (notmuch_message_file_t *message)
+_notmuch_message_file_close (notmuch_message_file_t *message)
 {
     talloc_free (message);
 }
@@ -170,25 +152,12 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)
        goto DONE;
     }
 
-    if (is_mbox) {
-       if (! g_mime_parser_eos (parser)) {
-           /* This is a multi-message mbox. */
-           status = NOTMUCH_STATUS_FILE_NOT_EMAIL;
-           goto DONE;
-       }
+    if (is_mbox && ! g_mime_parser_eos (parser)) {
        /*
-        * For historical reasons, we support single-message mboxes,
-        * but this behavior is likely to change in the future, so
-        * warn.
+        * This is a multi-message mbox. (For historical reasons, we
+        * do support single-message mboxes.)
         */
-       static notmuch_bool_t mbox_warning = FALSE;
-       if (! mbox_warning) {
-           mbox_warning = TRUE;
-           fprintf (stderr, "\
-Warning: %s is an mbox containing a single message,\n\
-likely caused by misconfigured mail delivery.  Support for single-message\n\
-mboxes is deprecated and may be removed in the future.\n", message->filename);
-       }
+       status = NOTMUCH_STATUS_FILE_NOT_EMAIL;
     }
 
   DONE:
@@ -297,7 +266,7 @@ _notmuch_message_file_get_combined_header (notmuch_message_file_t *message,
 }
 
 const char *
-notmuch_message_file_get_header (notmuch_message_file_t *message,
+_notmuch_message_file_get_header (notmuch_message_file_t *message,
                                 const char *header)
 {
     const char *value;