cli: abstract new mailbox creation

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index b89a17e5c4bfd5adeb5c3a9ce4aa74ca1c58da14..36f58eb8d54ce6f8584d03cab357611186f871a4 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -243,12 +243,26 @@ do_search_threads (search_context_t *ctx)
     return 0;
 }
 
+static mailbox_t *new_mailbox (void *ctx, const char *name, const char *addr)
+{
+    mailbox_t *mailbox;
+
+    mailbox = talloc (ctx, mailbox_t);
+    if (! mailbox)
+       return NULL;
+
+    mailbox->name = talloc_strdup (mailbox, name);
+    mailbox->addr = talloc_strdup (mailbox, addr);
+    mailbox->count = 1;
+
+    return mailbox;
+}
+
 /* Returns TRUE iff name and addr is duplicate. If not, stores the
  * name/addr pair in order to detect subsequent duplicates. */
 static notmuch_bool_t
 is_duplicate (const search_context_t *ctx, const char *name, const char *addr)
 {
-    notmuch_bool_t duplicate;
     char *key;
     mailbox_t *mailbox;
 
@@ -256,20 +270,20 @@ is_duplicate (const search_context_t *ctx, const char *name, const char *addr)
     if (! key)
        return FALSE;
 
-    duplicate = g_hash_table_lookup_extended (ctx->addresses, key, NULL, (gpointer)&mailbox);
-
-    if (! duplicate) {
-       mailbox = talloc (ctx->format, mailbox_t);
-       mailbox->name = talloc_strdup (mailbox, name);
-       mailbox->addr = talloc_strdup (mailbox, addr);
-       mailbox->count = 1;
-       g_hash_table_insert (ctx->addresses, key, mailbox);
-    } else {
+    mailbox = g_hash_table_lookup (ctx->addresses, key);
+    if (mailbox) {
        mailbox->count++;
        talloc_free (key);
+       return TRUE;
     }
 
-    return duplicate;
+    mailbox = new_mailbox (ctx->format, name, addr);
+    if (! mailbox)
+       return FALSE;
+
+    g_hash_table_insert (ctx->addresses, key, mailbox);
+
+    return FALSE;
 }
 
 static void
@@ -583,6 +597,8 @@ _notmuch_search_prepare (search_context_t *ctx, notmuch_config_t *config, int ar
        return EXIT_FAILURE;
     }
 
+    notmuch_exit_if_unmatched_db_uuid (ctx->notmuch);
+
     query_str = query_string_from_args (ctx->notmuch, argc, argv);
     if (query_str == NULL) {
        fprintf (stderr, "Out of memory.\n");