From 243ca658dff5aefa2d6c76121451463360fa56a7 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Thu, 3 Sep 2015 22:39:58 +0300 Subject: [PATCH] cli: abstract new mailbox creation We'll be needing more mailbox creation soon, so abstract it away. While at it, check for allocation failures. No other functional changes. --- notmuch-search.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/notmuch-search.c b/notmuch-search.c index 7fdc6aca..36f58eb8 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -243,6 +243,21 @@ 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 @@ -262,10 +277,10 @@ is_duplicate (const search_context_t *ctx, const char *name, const char *addr) return TRUE; } - mailbox = talloc (ctx->format, mailbox_t); - mailbox->name = talloc_strdup (mailbox, name); - mailbox->addr = talloc_strdup (mailbox, addr); - mailbox->count = 1; + mailbox = new_mailbox (ctx->format, name, addr); + if (! mailbox) + return FALSE; + g_hash_table_insert (ctx->addresses, key, mailbox); return FALSE; -- 2.26.2