Switch to normal glib hash table lookup. The extended version is only
required if the values may contain NULL.
static notmuch_bool_t
is_duplicate (const search_context_t *ctx, const char *name, const char *addr)
{
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;
char *key;
mailbox_t *mailbox;
- 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);
mailbox->count++;
talloc_free (key);
+ 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);
+
+ return FALSE;