debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-25 02:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: abstract new mailbox creation

Browse source 
We'll be needing more mailbox creation soon, so abstract it
away. While at it, check for allocation failures. No other functional
changes.
This commit is contained in:
Jani Nikula 2015-09-03 22:39:58 +03:00 committed by David Bremner
parent dfe15c0e1b
commit 243ca658df
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
notmuch-search.c
View file

@ -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;