hash_table_create(): Removed table_pool parameter.

Every single caller was using default_pool there, so there's no point in
having it.

diff --git a/src/anvil/connect-limit.c b/src/anvil/connect-limit.c
index f72ce45f1522fbb2b3fdf477fe2cb158852ae663..bd4f08ff16934a07aad23b907fa13b765233cda1 100644 (file)
--- a/src/anvil/connect-limit.c
+++ b/src/anvil/connect-limit.c
@@ -46,10 +46,10 @@ struct connect_limit *connect_limit_init(void)
 
        limit = i_new(struct connect_limit, 1);
        limit->ident_hash =
-               hash_table_create(default_pool, default_pool, 0,
+               hash_table_create(default_pool, 0,
                                  str_hash, (hash_cmp_callback_t *)strcmp);
        limit->ident_pid_hash =
-               hash_table_create(default_pool, default_pool, 0,
+               hash_table_create(default_pool, 0,
                                  ident_pid_hash, ident_pid_cmp);
        return limit;
 }

diff --git a/src/anvil/penalty.c b/src/anvil/penalty.c
index a3eb676a7fe43db03a5fc10c48788c1e8b73dd15..2742193a162a42a69c41bce57a127ac15540ad2c 100644 (file)
--- a/src/anvil/penalty.c
+++ b/src/anvil/penalty.c
@@ -51,7 +51,7 @@ struct penalty *penalty_init(void)
 
        penalty = i_new(struct penalty, 1);
        penalty->hash =
-               hash_table_create(default_pool, default_pool, 0,
+               hash_table_create(default_pool, 0,
                                  str_hash, (hash_cmp_callback_t *)strcmp);
        penalty->expire_secs = PENALTY_DEFAULT_EXPIRE_SECS;
        return penalty;

diff --git a/src/auth/auth-cache.c b/src/auth/auth-cache.c
index 616033fa893d28d695abdc96cdc8158f8f28aec1..cf80feda6899edacebf734cfc2f9a26041f2265a 100644 (file)
--- a/src/auth/auth-cache.c
+++ b/src/auth/auth-cache.c
@@ -221,7 +221,7 @@ struct auth_cache *auth_cache_new(size_t max_size, unsigned int ttl_secs,
        struct auth_cache *cache;
 
        cache = i_new(struct auth_cache, 1);
-       cache->hash = hash_table_create(default_pool, default_pool, 0, str_hash,
+       cache->hash = hash_table_create(default_pool, 0, str_hash,
                                        (hash_cmp_callback_t *)strcmp);
        cache->size_left = max_size;
        cache->ttl_secs = ttl_secs;

diff --git a/src/auth/auth-request-handler.c b/src/auth/auth-request-handler.c
index f5c207b7f4275daa02cc81dbdc8d1b2256f87a76..77a9fd81c82653c8ab00ac0809823396e0db864d 100644 (file)
--- a/src/auth/auth-request-handler.c
+++ b/src/auth/auth-request-handler.c
@@ -52,7 +52,7 @@ auth_request_handler_create(auth_request_callback_t *callback, void *context,
        handler = p_new(pool, struct auth_request_handler, 1);
        handler->refcount = 1;
        handler->pool = pool;
-       handler->requests = hash_table_create(default_pool, pool, 0, NULL, NULL);
+       handler->requests = hash_table_create(pool, 0, NULL, NULL);
        handler->callback = callback;
        handler->context = context;
        handler->master_callback = master_callback;

diff --git a/src/auth/db-checkpassword.c b/src/auth/db-checkpassword.c
index 4f3a3ce1c6b2dbf335c9590bd51c22d78f20aeba..da83fb0e3ff05a544a9e56dc6d5bdc45c892b1b3 100644 (file)
--- a/src/auth/db-checkpassword.c
+++ b/src/auth/db-checkpassword.c
@@ -545,7 +545,7 @@ db_checkpassword_init(const char *checkpassword_path,
        db = i_new(struct db_checkpassword, 1);
        db->checkpassword_path = i_strdup(checkpassword_path);
        db->checkpassword_reply_path = i_strdup(checkpassword_reply_path);
-       db->clients = hash_table_create(default_pool, default_pool, 0,
+       db->clients = hash_table_create(default_pool, 0,
                                        NULL, NULL);
        db->child_wait =
                child_wait_new_with_pid((pid_t)-1, sigchld_handler, db);

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index c893d46464fda11959b2ce2054a3c3b4f9c3eadd..52cc8386b5de879c7f0121eef232cf45cd0537ed 100644 (file)
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -1196,7 +1196,7 @@ db_ldap_result_iterate_init(struct ldap_connection *conn, LDAPMessage *entry,
        ctx->auth_request = auth_request;
        ctx->attr_map = attr_map;
        ctx->ldap_attrs =
-               hash_table_create(default_pool, pool, 0, strcase_hash,
+               hash_table_create(pool, 0, strcase_hash,
                                  (hash_cmp_callback_t *)strcasecmp);
        if (auth_request->set->debug)
                ctx->debug = t_str_new(256);

diff --git a/src/auth/db-passwd-file.c b/src/auth/db-passwd-file.c
index 697f7254f26a527985861a71b88ee8a4bb791b33..a46c49582da9bdc0fa082c4db3009693536a90d4 100644 (file)
--- a/src/auth/db-passwd-file.c
+++ b/src/auth/db-passwd-file.c
@@ -194,7 +194,7 @@ static bool passwd_file_open(struct passwd_file *pw, bool startup)
        pw->size = st.st_size;
 
        pw->pool = pool_alloconly_create(MEMPOOL_GROWING"passwd_file", 10240);
-       pw->users = hash_table_create(default_pool, pw->pool, 100,
+       pw->users = hash_table_create(pw->pool, 100,
                                      str_hash, (hash_cmp_callback_t *)strcmp);
 
        start_time = time(NULL);
@@ -344,8 +344,7 @@ db_passwd_file_init(const char *path, bool userdb, bool debug)
 
        db->path = i_strdup(path);
        if (db->vars) {
-               db->files = hash_table_create(default_pool, default_pool, 100,
-                                             str_hash,
+               db->files = hash_table_create(default_pool, 100, str_hash,
                                              (hash_cmp_callback_t *)strcmp);
        } else {
                db->default_file = passwd_file_new(db, path);

diff --git a/src/auth/mech-otp-skey-common.c b/src/auth/mech-otp-skey-common.c
index 998c2d73381c0d500bdf2564cf1fde1ae1ee8624..10be9d7818de2b3b71ad625b6ec6231804b8c291 100644 (file)
--- a/src/auth/mech-otp-skey-common.c
+++ b/src/auth/mech-otp-skey-common.c
@@ -20,8 +20,7 @@ void otp_lock_init(void)
        if (otp_lock_table != NULL)
                return;
 
-       otp_lock_table = hash_table_create(system_pool, system_pool,
-                                          128, strcase_hash,
+       otp_lock_table = hash_table_create(default_pool, 128, strcase_hash,
                                           (hash_cmp_callback_t *)strcasecmp);
 }
 

diff --git a/src/config/config-request.c b/src/config/config-request.c
index a2ea253b69669ef6640826808a706be7ea3b8d69..0d21d37132b77a5ad14e7105b7adc273e36752b7 100644 (file)
--- a/src/config/config-request.c
+++ b/src/config/config-request.c
@@ -361,8 +361,8 @@ config_export_init(const char *module, enum config_dump_scope scope,
        ctx->scope = scope;
        ctx->value = t_str_new(256);
        ctx->prefix = t_str_new(64);
-       ctx->keys = hash_table_create(default_pool, ctx->pool, 0,
-                                     str_hash, (hash_cmp_callback_t *)strcmp);
+       ctx->keys = hash_table_create(ctx->pool, 0, str_hash,
+                                     (hash_cmp_callback_t *)strcmp);
        return ctx;
 }
 

diff --git a/src/director/director-test.c b/src/director/director-test.c
index 20f9668cb4ddc18176c36351f82eebae40ba7dea..326e2bba16d2222962179152536975e26d063f28 100644 (file)
--- a/src/director/director-test.c
+++ b/src/director/director-test.c
@@ -532,9 +532,9 @@ director_connection_disconnect_timeout(void *context ATTR_UNUSED)
 
 static void main_init(const char *admin_path)
 {
-       users = hash_table_create(default_pool, default_pool, 0,
-                                 str_hash, (hash_cmp_callback_t *)strcmp);
-       hosts = hash_table_create(default_pool, default_pool, 0,
+       users = hash_table_create(default_pool, 0, str_hash,
+                                 (hash_cmp_callback_t *)strcmp);
+       hosts = hash_table_create(default_pool, 0,
                                  (hash_callback_t *)net_ip_hash,
                                  (hash_cmp_callback_t *)net_ip_cmp);
        i_array_init(&hosts_array, 256);

diff --git a/src/director/user-directory.c b/src/director/user-directory.c
index 525de2a158b6fc696b7d988c214d3a7a442882ee..ed82051244766aa1e158dcbe161975106c1fc73d 100644 (file)
--- a/src/director/user-directory.c
+++ b/src/director/user-directory.c
@@ -225,8 +225,7 @@ user_directory_init(unsigned int timeout_secs, const char *username_hash_fmt)
                I_MAX(dir->user_near_expiring_secs, 1);
 
        dir->username_hash_fmt = i_strdup(username_hash_fmt);
-       dir->hash = hash_table_create(default_pool, default_pool,
-                                     0, NULL, NULL);
+       dir->hash = hash_table_create(default_pool, 0, NULL, NULL);
        i_array_init(&dir->iters, 8);
        return dir;
 }

diff --git a/src/doveadm/doveadm-director.c b/src/doveadm/doveadm-director.c
index d24702233e6a9be35c18676619f6f27ed48158f1..50873b9f1d67de22813f7703008b513c488cc83e 100644 (file)
--- a/src/doveadm/doveadm-director.c
+++ b/src/doveadm/doveadm-director.c
@@ -295,7 +295,7 @@ static void cmd_director_map(int argc, char *argv[])
                director_get_host(argv[optind], &ips, &ips_count);
 
        pool = pool_alloconly_create("director map users", 1024*128);
-       users = hash_table_create(default_pool, pool, 0, NULL, NULL);
+       users = hash_table_create(pool, 0, NULL, NULL);
        if (ctx->users_path == NULL)
                userdb_get_user_list(NULL, pool, users);
        else

diff --git a/src/doveadm/doveadm-kick.c b/src/doveadm/doveadm-kick.c
index 41650213e8e61b073430fa1d30fe1fada59d5227..92ad35bf75aac882a2df194f631afebeb8f1b173 100644 (file)
--- a/src/doveadm/doveadm-kick.c
+++ b/src/doveadm/doveadm-kick.c
@@ -179,7 +179,7 @@ static void cmd_kick(int argc, char *argv[])
        ctx.who.anvil_path = t_strconcat(doveadm_settings->base_dir, "/anvil", NULL);
        ctx.force_kick = FALSE;
        ctx.who.pool = pool_alloconly_create("kick pids", 10240);
-       ctx.pids = hash_table_create(default_pool, ctx.who.pool, 0, NULL, NULL);
+       ctx.pids = hash_table_create(ctx.who.pool, 0, NULL, NULL);
 
        while ((c = getopt(argc, argv, "a:f")) > 0) {
                switch (c) {

diff --git a/src/doveadm/doveadm-log.c b/src/doveadm/doveadm-log.c
index 225f603771bd3dc9ef45321486307468b05077ca..e36ff34988b558ef056c3d686842ca42c9ded91e 100644 (file)
--- a/src/doveadm/doveadm-log.c
+++ b/src/doveadm/doveadm-log.c
@@ -222,7 +222,7 @@ static void cmd_log_find(int argc, char *argv[])
 
        memset(&ctx, 0, sizeof(ctx));
        ctx.pool = pool_alloconly_create("log file", 1024*32);
-       ctx.files = hash_table_create(default_pool, ctx.pool, 0,
+       ctx.files = hash_table_create(ctx.pool, 0,
                                      str_hash, (hash_cmp_callback_t *)strcmp);
 
        /* first get the paths that we know are used */

diff --git a/src/doveadm/doveadm-mail-server.c b/src/doveadm/doveadm-mail-server.c
index 74b1ff05760e53ebede4c6fea042811245c53f80..07e051ec51ad9e9a6c182e715d605195ec792982 100644 (file)
--- a/src/doveadm/doveadm-mail-server.c
+++ b/src/doveadm/doveadm-mail-server.c
@@ -38,8 +38,7 @@ doveadm_server_get(struct doveadm_mail_cmd_context *ctx, const char *name)
 
        if (servers == NULL) {
                server_pool = pool_alloconly_create("doveadm servers", 1024*16);
-               servers = hash_table_create(default_pool, server_pool, 0,
-                                           str_hash,
+               servers = hash_table_create(server_pool, 0, str_hash,
                                            (hash_cmp_callback_t *)strcmp);
        }
        server = hash_table_lookup(servers, name);

diff --git a/src/doveadm/doveadm-stats.c b/src/doveadm/doveadm-stats.c
index 976b6c89529784cd5028092fb5beb23ed9770e03..8766963029d430ad53977ea96e365bf7796701c2 100644 (file)
--- a/src/doveadm/doveadm-stats.c
+++ b/src/doveadm/doveadm-stats.c
@@ -478,7 +478,7 @@ static void stats_top(const char *path, const char *sort_type)
        ctx.cur_pool = pool_alloconly_create("stats top", 1024*16);
        i_array_init(&ctx.lines, 128);
        ctx.sessions =
-               hash_table_create(default_pool, default_pool, 0,
+               hash_table_create(default_pool, 0,
                                  str_hash, (hash_cmp_callback_t *)strcmp);
        net_set_nonblock(ctx.fd, FALSE);
 

diff --git a/src/doveadm/doveadm-who.c b/src/doveadm/doveadm-who.c
index eb08495ca038bd596cc633fa5e82ca98e53023be..36a44f9ae2858b3b509e4173446c1b5d2a46ca54 100644 (file)
--- a/src/doveadm/doveadm-who.c
+++ b/src/doveadm/doveadm-who.c
@@ -274,7 +274,7 @@ static void cmd_who(int argc, char *argv[])
        memset(&ctx, 0, sizeof(ctx));
        ctx.anvil_path = t_strconcat(doveadm_settings->base_dir, "/anvil", NULL);
        ctx.pool = pool_alloconly_create("who users", 10240);
-       ctx.users = hash_table_create(default_pool, ctx.pool, 0,
+       ctx.users = hash_table_create(ctx.pool, 0,
                                      who_user_hash, who_user_cmp);
 
        while ((c = getopt(argc, argv, "1a:")) > 0) {

diff --git a/src/doveadm/dsync/dsync-brain.c b/src/doveadm/dsync/dsync-brain.c
index 9a86dda9852419242a4cca61c9f27f3934c880cb..e30b3345ccbc14ed3ba0ccee76f7be1e4a4fcc80 100644 (file)
--- a/src/doveadm/dsync/dsync-brain.c
+++ b/src/doveadm/dsync/dsync-brain.c
@@ -48,8 +48,7 @@ dsync_brain_common_init(struct mail_user *user, struct dsync_slave *slave)
        brain->slave = slave;
        brain->sync_type = DSYNC_BRAIN_SYNC_TYPE_UNKNOWN;
        brain->remote_mailbox_states =
-               hash_table_create(default_pool, brain->pool, 0,
-                                 guid_128_hash, guid_128_cmp);
+               hash_table_create(brain->pool, 0, guid_128_hash, guid_128_cmp);
        p_array_init(&brain->mailbox_states, pool, 64);
        return brain;
 }

diff --git a/src/doveadm/dsync/dsync-mailbox-export.c b/src/doveadm/dsync/dsync-mailbox-export.c
index 34ad91cac8fac3181aa1cb2138d8415f282b3aa9..a1ddaf7c754d5d210ad09f918c519722b2c6a592 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-export.c
+++ b/src/doveadm/dsync/dsync-mailbox-export.c
@@ -392,7 +392,7 @@ dsync_mailbox_export_log_scan(struct dsync_mailbox_exporter *exporter,
 
        /* clone the hash table, since we're changing it. */
        exporter->changes =
-               hash_table_create(default_pool, exporter->pool,
+               hash_table_create(exporter->pool,
                                  hash_table_count(log_changes), NULL, NULL);
        iter = hash_table_iterate_init(log_changes);
        while (hash_table_iterate(iter, &key, &value)) {
@@ -431,7 +431,7 @@ dsync_mailbox_export_init(struct mailbox *box,
                (flags & DSYNC_MAILBOX_EXPORTER_FLAG_MAILS_HAVE_GUIDS) != 0;
        p_array_init(&exporter->requested_uids, pool, 16);
        exporter->export_guids =
-               hash_table_create(default_pool, pool, 0,
+               hash_table_create(pool, 0,
                                  str_hash, (hash_cmp_callback_t *)strcmp);
        p_array_init(&exporter->expunged_seqs, pool, 16);
        p_array_init(&exporter->expunged_guids, pool, 16);

diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index 3650031201612d4b460b502649db98ca055210e0..9fbcee0f3b3f289be8192cfab1454fa5101c2569 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -135,10 +135,10 @@ dsync_mailbox_import_init(struct mailbox *box,
        importer->remote_highest_modseq = remote_highest_modseq;
 
        importer->import_guids =
-               hash_table_create(default_pool, pool, 0,
+               hash_table_create(pool, 0,
                                  str_hash, (hash_cmp_callback_t *)strcmp);
        importer->import_uids =
-               hash_table_create(default_pool, pool, 0, NULL, NULL);
+               hash_table_create(pool, 0, NULL, NULL);
        i_array_init(&importer->maybe_expunge_uids, 16);
        i_array_init(&importer->maybe_saves, 128);
        i_array_init(&importer->newmails, 128);

diff --git a/src/doveadm/dsync/dsync-mailbox-tree.c b/src/doveadm/dsync/dsync-mailbox-tree.c
index d402bf5e194c3a9f6801100aa579a8dd99873d55..d6a06bfab37b3e272c906bc65d61e8992236b7ff 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-tree.c
+++ b/src/doveadm/dsync/dsync-mailbox-tree.c
@@ -211,7 +211,7 @@ void dsync_mailbox_tree_build_name128_hash(struct dsync_mailbox_tree *tree)
 
        i_assert(tree->name128_hash == NULL);
 
-       tree->name128_hash = hash_table_create(default_pool, tree->pool, 0,
+       tree->name128_hash = hash_table_create(tree->pool, 0,
                                               guid_128_hash, guid_128_cmp);
        iter = dsync_mailbox_tree_iter_init(tree);
        while (dsync_mailbox_tree_iter_next(iter, &name, &node)) {
@@ -251,7 +251,7 @@ dsync_mailbox_tree_build_name128_remotesep_hash(struct dsync_mailbox_tree *tree)
        i_assert(tree->name128_remotesep_hash == NULL);
 
        tree->name128_remotesep_hash =
-               hash_table_create(default_pool, tree->pool, 0,
+               hash_table_create(tree->pool, 0,
                                  guid_128_hash, guid_128_cmp);
        iter = dsync_mailbox_tree_iter_init(tree);
        while (dsync_mailbox_tree_iter_next(iter, &name, &node)) {
@@ -296,7 +296,7 @@ int dsync_mailbox_tree_build_guid_hash(struct dsync_mailbox_tree *tree)
 
        i_assert(tree->guid_hash == NULL);
 
-       tree->guid_hash = hash_table_create(default_pool, tree->pool, 0,
+       tree->guid_hash = hash_table_create(tree->pool, 0,
                                            guid_128_hash, guid_128_cmp);
        iter = dsync_mailbox_tree_iter_init(tree);
        while (dsync_mailbox_tree_iter_next(iter, &name, &node))

diff --git a/src/doveadm/dsync/dsync-transaction-log-scan.c b/src/doveadm/dsync/dsync-transaction-log-scan.c
index 2b2fbe8cc6deb1379911e43af5993420027f9871..52a75d9de6cf87b84f63480151ba3700ac2b333d 100644 (file)
--- a/src/doveadm/dsync/dsync-transaction-log-scan.c
+++ b/src/doveadm/dsync/dsync-transaction-log-scan.c
@@ -343,8 +343,7 @@ int dsync_transaction_log_scan_init(struct mail_index_view *view,
                                     10240);
        ctx = p_new(pool, struct dsync_transaction_log_scan, 1);
        ctx->pool = pool;
-       ctx->changes =
-               hash_table_create(default_pool, pool, 0, NULL, NULL);
+       ctx->changes = hash_table_create(pool, 0, NULL, NULL);
        ctx->view = view;
        ctx->highest_wanted_uid = highest_wanted_uid;
 

diff --git a/src/indexer/indexer-queue.c b/src/indexer/indexer-queue.c
index 5f3c930effab24bf543fb61266b3d866000576ee..f21c6f4b13fb3701ae96f818d0bdb9a33449f2f6 100644 (file)
--- a/src/indexer/indexer-queue.c
+++ b/src/indexer/indexer-queue.c
@@ -36,7 +36,7 @@ indexer_queue_init(indexer_status_callback_t *callback)
        
        queue = i_new(struct indexer_queue, 1);
        queue->callback = callback;
-       queue->requests = hash_table_create(default_pool, default_pool, 0,
+       queue->requests = hash_table_create(default_pool, 0,
                                            indexer_request_hash,
                                            indexer_request_cmp);
        return queue;

diff --git a/src/lib-auth/auth-server-connection.c b/src/lib-auth/auth-server-connection.c
index bf600de2fc4737f4eb0325d194042e822345a55c..34c36cb481739c2f68ea6c3b0c0d02bb787c39ad 100644 (file)
--- a/src/lib-auth/auth-server-connection.c
+++ b/src/lib-auth/auth-server-connection.c
@@ -303,7 +303,7 @@ auth_server_connection_init(struct auth_client *client)
 
        conn->client = client;
        conn->fd = -1;
-       conn->requests = hash_table_create(default_pool, pool, 100, NULL, NULL);
+       conn->requests = hash_table_create(pool, 100, NULL, NULL);
        i_array_init(&conn->available_auth_mechs, 8);
        return conn;
 }

diff --git a/src/lib-dict/dict-file.c b/src/lib-dict/dict-file.c
index 52b055ce04186443a156a4288f9dc1364e7d0040..a75bbb99bf48709b2ef7df00555ec980966d860b 100644 (file)
--- a/src/lib-dict/dict-file.c
+++ b/src/lib-dict/dict-file.c
@@ -77,7 +77,7 @@ static struct dict *file_dict_init(struct dict *driver, const char *uri,
        }
        dict->dict = *driver;
        dict->hash_pool = pool_alloconly_create("file dict", 1024);
-       dict->hash = hash_table_create(default_pool, dict->hash_pool, 0,
+       dict->hash = hash_table_create(dict->hash_pool, 0,
                                       str_hash, (hash_cmp_callback_t *)strcmp);
        dict->fd = -1;
        return &dict->dict;

diff --git a/src/lib-index/mail-cache.c b/src/lib-index/mail-cache.c
index 9b337d264f386d9add39f10216d7f0cb0079fc03..8bccc461544a4f527829d4213c0fe6a348b5b646 100644 (file)
--- a/src/lib-index/mail-cache.c
+++ b/src/lib-index/mail-cache.c
@@ -411,7 +411,7 @@ static struct mail_cache *mail_cache_alloc(struct mail_index *index)
                i_strconcat(index->filepath, MAIL_CACHE_FILE_SUFFIX, NULL);
        cache->field_pool = pool_alloconly_create("Cache fields", 2048);
        cache->field_name_hash =
-               hash_table_create(default_pool, cache->field_pool, 0,
+               hash_table_create(cache->field_pool, 0,
                                  strcase_hash, (hash_cmp_callback_t *)strcasecmp);
 
        cache->dotlock_settings.use_excl_lock =

diff --git a/src/lib-index/mail-index.c b/src/lib-index/mail-index.c
index 223fb6b3279dcaf61bd9ad759c07f7590cc6d553..f64daa074441fd578677d08154915a5c67af3c10 100644 (file)
--- a/src/lib-index/mail-index.c
+++ b/src/lib-index/mail-index.c
@@ -53,7 +53,7 @@ struct mail_index *mail_index_alloc(const char *dir, const char *prefix)
        index->keywords_pool = pool_alloconly_create("keywords", 512);
        i_array_init(&index->keywords, 16);
        index->keywords_hash =
-               hash_table_create(default_pool, index->keywords_pool, 0,
+               hash_table_create(index->keywords_pool, 0,
                                  strcase_hash, (hash_cmp_callback_t *)strcasecmp);
        index->log = mail_transaction_log_alloc(index);
        mail_index_modseq_init(index);

diff --git a/src/lib-lda/duplicate.c b/src/lib-lda/duplicate.c
index 3ea487dc5501cff169048ded82a3dd9fdb9cdf4c..73d23d7647839f628770bc2c2933bbd246eb6c68 100644 (file)
--- a/src/lib-lda/duplicate.c
+++ b/src/lib-lda/duplicate.c
@@ -214,7 +214,7 @@ static struct duplicate_file *duplicate_file_new(struct duplicate_context *ctx)
                                         &file->dotlock);
        if (file->new_fd == -1)
                i_error("file_dotlock_create(%s) failed: %m", file->path);
-       file->hash = hash_table_create(default_pool, pool, 0,
+       file->hash = hash_table_create(pool, 0,
                                       duplicate_hash, duplicate_cmp);
        (void)duplicate_read(file);
        return file;

diff --git a/src/lib-master/master-auth.c b/src/lib-master/master-auth.c
index c57abca4a5ad7be9f910dafafd08c8880f7db235..694134837d2c95fd580f4ead8f4469d4d77d0e65 100644 (file)
--- a/src/lib-master/master-auth.c
+++ b/src/lib-master/master-auth.c
@@ -51,8 +51,7 @@ master_auth_init(struct master_service *service, const char *path)
        auth->pool = pool;
        auth->service = service;
        auth->path = p_strdup(pool, path);
-       auth->connections = hash_table_create(default_pool, pool,
-                                             0, NULL, NULL);
+       auth->connections = hash_table_create(pool, 0, NULL, NULL);
        return auth;
 }
 

diff --git a/src/lib-master/master-login-auth.c b/src/lib-master/master-login-auth.c
index 73ee2c9cfa00f748a07ab172517f0e26399c7277..31a20a4af59ca672a2d02d9624e5fa7fd7d8883c 100644 (file)
--- a/src/lib-master/master-login-auth.c
+++ b/src/lib-master/master-login-auth.c
@@ -71,7 +71,7 @@ struct master_login_auth *master_login_auth_init(const char *auth_socket_path)
        auth->auth_socket_path = p_strdup(pool, auth_socket_path);
        auth->refcount = 1;
        auth->fd = -1;
-       auth->requests = hash_table_create(default_pool, pool, 0, NULL, NULL);
+       auth->requests = hash_table_create(pool, 0, NULL, NULL);
        auth->id_counter = (rand() % 32767) * 131072U;
        return auth;
 }

diff --git a/src/lib-master/master-service-settings-cache.c b/src/lib-master/master-service-settings-cache.c
index 5e1411b7185ec8f3e8562d2cc5c18355a4bb200d..0797ba81bacc71e22a5c04dc04f00579d01a404b 100644 (file)
--- a/src/lib-master/master-service-settings-cache.c
+++ b/src/lib-master/master-service-settings-cache.c
@@ -233,7 +233,7 @@ cache_add(struct master_service_settings_cache *cache,
        if (input->local_name != NULL) {
                if (cache->local_name_hash == NULL) {
                        cache->local_name_hash =
-                               hash_table_create(default_pool, cache->pool, 0,
+                               hash_table_create(cache->pool, 0,
                                                  str_hash,
                                                  (hash_cmp_callback_t *)strcmp);
                }
@@ -243,7 +243,7 @@ cache_add(struct master_service_settings_cache *cache,
        if (input->local_ip.family != 0) {
                if (cache->local_ip_hash == NULL) {
                        cache->local_ip_hash =
-                               hash_table_create(default_pool, cache->pool, 0,
+                               hash_table_create(cache->pool, 0,
                                                  (hash_callback_t *)net_ip_hash,
                                                  (hash_cmp_callback_t *)net_ip_cmp);
                }

diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c
index 70b968991485b9a61265c715eb9961e52ea23030..59f3077d4559e57aa5415f1ec6802fa27516dae8 100644 (file)
--- a/src/lib-settings/settings-parser.c
+++ b/src/lib-settings/settings-parser.c
@@ -206,7 +206,7 @@ settings_parser_init_list(pool_t set_pool,
        ctx->set_pool = set_pool;
        ctx->parser_pool = parser_pool;
        ctx->flags = flags;
-       ctx->links = hash_table_create(default_pool, ctx->parser_pool, 0,
+       ctx->links = hash_table_create(ctx->parser_pool, 0,
                                       str_hash, (hash_cmp_callback_t *)strcmp);
 
        ctx->root_count = count;
@@ -1753,8 +1753,7 @@ settings_parser_dup(const struct setting_parser_context *old_ctx,
        new_ctx->error = p_strdup(new_ctx->parser_pool, old_ctx->error);
        new_ctx->prev_info = old_ctx->prev_info;
 
-       links = hash_table_create(default_pool, new_ctx->parser_pool,
-                                 0, NULL, NULL);
+       links = hash_table_create(new_ctx->parser_pool, 0, NULL, NULL);
 
        new_ctx->root_count = old_ctx->root_count;
        new_ctx->roots = p_new(new_ctx->parser_pool, struct setting_link,
@@ -1777,7 +1776,7 @@ settings_parser_dup(const struct setting_parser_context *old_ctx,
        }
 
        new_ctx->links =
-               hash_table_create(default_pool, new_ctx->parser_pool, 0,
+               hash_table_create(new_ctx->parser_pool, 0,
                                  str_hash, (hash_cmp_callback_t *)strcmp);
 
        iter = hash_table_iterate_init(old_ctx->links);

diff --git a/src/lib-sql/sql-db-cache.c b/src/lib-sql/sql-db-cache.c
index aa9377fa78c0baa35c3c81cc8410473d498d95dd..dd89046c82760ffbcb998bf01e92c32250062ceb 100644 (file)
--- a/src/lib-sql/sql-db-cache.c
+++ b/src/lib-sql/sql-db-cache.c
@@ -128,7 +128,7 @@ struct sql_db_cache *sql_db_cache_init(unsigned int max_unused_connections)
        struct sql_db_cache *cache;
 
        cache = i_new(struct sql_db_cache, 1);
-       cache->dbs = hash_table_create(default_pool, default_pool, 0, str_hash,
+       cache->dbs = hash_table_create(default_pool, 0, str_hash,
                                       (hash_cmp_callback_t *)strcmp);
        cache->max_unused_connections = max_unused_connections;
        return cache;

diff --git a/src/lib-storage/index/dbox-multi/mdbox-purge.c b/src/lib-storage/index/dbox-multi/mdbox-purge.c
index b94674ea29b2d116ecafd3e16566730ae54c6618..884d271cabc50a4a532c51d9127c799ed99b6e7d 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-purge.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-purge.c
@@ -475,7 +475,7 @@ mdbox_purge_alloc(struct mdbox_storage *storage)
        ctx->lowest_primary_file_id = (uint32_t)-1;
        i_array_init(&ctx->primary_file_ids, 64);
        i_array_init(&ctx->purge_file_ids, 64);
-       ctx->altmoves = hash_table_create(default_pool, pool, 0, NULL, NULL);
+       ctx->altmoves = hash_table_create(pool, 0, NULL, NULL);
        return ctx;
 }
 

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
index cc8cc80793a9fd6d11d8459ea6e76daecd5d423d..ead3d9adfec13007f120ee2c7997857d669765ec 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
@@ -69,7 +69,7 @@ mdbox_storage_rebuild_init(struct mdbox_storage *storage,
        ctx->storage = storage;
        ctx->atomic = atomic;
        ctx->pool = pool_alloconly_create("dbox map rebuild", 1024*256);
-       ctx->guid_hash = hash_table_create(default_pool, ctx->pool, 0,
+       ctx->guid_hash = hash_table_create(ctx->pool, 0,
                                           guid_128_hash, guid_128_cmp);
        i_array_init(&ctx->msgs, 512);
        i_array_init(&ctx->seen_file_ids, 128);

diff --git a/src/lib-storage/index/index-thread-finish.c b/src/lib-storage/index/index-thread-finish.c
index e1802ae11d97c5507254f81af11f7df057b76441..0e905aa4b82b8c8baf9f55960fb8873a45768299 100644 (file)
--- a/src/lib-storage/index/index-thread-finish.c
+++ b/src/lib-storage/index/index-thread-finish.c
@@ -223,7 +223,7 @@ static void gather_base_subjects(struct thread_finish_context *ctx)
                pool_alloconly_create(MEMPOOL_GROWING"base subjects",
                                      nearest_power(count * 20));
        gather_ctx.subject_hash =
-               hash_table_create(default_pool, gather_ctx.subject_pool,
+               hash_table_create(gather_ctx.subject_pool,
                                  count * 2, str_hash,
                                  (hash_cmp_callback_t *)strcmp);
 

diff --git a/src/lib-storage/index/maildir/maildir-keywords.c b/src/lib-storage/index/maildir/maildir-keywords.c
index c0cc8f0d7d62fa8d467fbfb7464fb78d81d7ebb2..21e4e27cde8a29c21d55fae652d79931896cc582 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-keywords.c
+++ b/src/lib-storage/index/maildir/maildir-keywords.c
@@ -74,8 +74,8 @@ maildir_keywords_init_readonly(struct mailbox *box)
        mk->path = i_strconcat(dir, "/" MAILDIR_KEYWORDS_NAME, NULL);
        mk->pool = pool_alloconly_create("maildir keywords", 512);
        i_array_init(&mk->list, MAILDIR_MAX_KEYWORDS);
-       mk->hash = hash_table_create(default_pool, mk->pool, 0,
-                                    strcase_hash, (hash_cmp_callback_t *)strcasecmp);
+       mk->hash = hash_table_create(mk->pool, 0, strcase_hash,
+                                    (hash_cmp_callback_t *)strcasecmp);
 
        mk->dotlock_settings.use_excl_lock =
                box->storage->set->dotlock_use_excl;

diff --git a/src/lib-storage/index/maildir/maildir-uidlist.c b/src/lib-storage/index/maildir/maildir-uidlist.c
index 28dfe2a86ab56f758ee46be3c8621171aee26a2e..69f8ddf3119f87f103eae0f21712a9d5db7572b2 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-uidlist.c
+++ b/src/lib-storage/index/maildir/maildir-uidlist.c
@@ -271,7 +271,7 @@ struct maildir_uidlist *maildir_uidlist_init(struct maildir_mailbox *mbox)
        uidlist->fd = -1;
        uidlist->path = i_strconcat(control_dir, "/"MAILDIR_UIDLIST_NAME, NULL);
        i_array_init(&uidlist->records, 128);
-       uidlist->files = hash_table_create(default_pool, default_pool, 4096,
+       uidlist->files = hash_table_create(default_pool, 4096,
                                           maildir_filename_base_hash,
                                           maildir_filename_base_cmp);
        uidlist->next_uid = 1;
@@ -1650,7 +1650,7 @@ int maildir_uidlist_sync_init(struct maildir_uidlist *uidlist,
 
        ctx->record_pool = pool_alloconly_create(MEMPOOL_GROWING
                                                 "maildir_uidlist_sync", 16384);
-       ctx->files = hash_table_create(default_pool, ctx->record_pool, 4096,
+       ctx->files = hash_table_create(ctx->record_pool, 4096,
                                       maildir_filename_base_hash,
                                       maildir_filename_base_cmp);
 

diff --git a/src/lib-storage/list/mailbox-list-index.c b/src/lib-storage/list/mailbox-list-index.c
index 00e2b1e61f536c50b980cb0aaea1ea02e4c14662..bbebdc1de6a687da7ae4fa2625a14fc98e209360 100644 (file)
--- a/src/lib-storage/list/mailbox-list-index.c
+++ b/src/lib-storage/list/mailbox-list-index.c
@@ -440,11 +440,9 @@ static void mailbox_list_index_created(struct mailbox_list *list)
 
        ilist->mailbox_pool = pool_alloconly_create("mailbox list index", 4096);
        ilist->mailbox_names =
-               hash_table_create(default_pool, ilist->mailbox_pool,
-                                 0, NULL, NULL);
+               hash_table_create(ilist->mailbox_pool, 0, NULL, NULL);
        ilist->mailbox_hash =
-               hash_table_create(default_pool, ilist->mailbox_pool,
-                                 0, NULL, NULL);
+               hash_table_create(ilist->mailbox_pool, 0, NULL, NULL);
 
        mailbox_list_index_status_init_list(list);
 }

diff --git a/src/lib-storage/mailbox-guid-cache.c b/src/lib-storage/mailbox-guid-cache.c
index 9992fd61dfb409e70ec1d4bc9174df4e83424cc6..b2f1ddf27fc5c3e5c8baefac2641bf7ffd8dd888 100644 (file)
--- a/src/lib-storage/mailbox-guid-cache.c
+++ b/src/lib-storage/mailbox-guid-cache.c
@@ -45,8 +45,7 @@ void mailbox_guid_cache_refresh(struct mailbox_list *list)
        if (list->guid_cache == NULL) {
                list->guid_cache_pool =
                        pool_alloconly_create("guid cache", 1024*16);
-               list->guid_cache = hash_table_create(default_pool,
-                                                    list->guid_cache_pool, 0,
+               list->guid_cache = hash_table_create(list->guid_cache_pool, 0,
                                                     guid_128_hash,
                                                     guid_128_cmp);
        } else {

diff --git a/src/lib/child-wait.c b/src/lib/child-wait.c
index 9d4cb09031504533650d839c96f9412f7a44c1cc..65d4d1f8d3a2cca2013a268c43e64dddf4ecd723 100644 (file)
--- a/src/lib/child-wait.c
+++ b/src/lib/child-wait.c
@@ -88,8 +88,7 @@ sigchld_handler(const siginfo_t *si ATTR_UNUSED, void *context ATTR_UNUSED)
 
 void child_wait_init(void)
 {
-       child_pids = hash_table_create(default_pool, default_pool, 0,
-                                      NULL, NULL);
+       child_pids = hash_table_create(default_pool, 0, NULL, NULL);
 
        lib_signals_set_handler(SIGCHLD, LIBSIG_FLAGS_SAFE,
                                sigchld_handler, NULL);

diff --git a/src/lib/hash.c b/src/lib/hash.c
index 124f103fc0430a71c061cc971f79e8c9caa85fd3..f34a2b0dabf7c2a854f576496d5f5da6880b951b 100644 (file)
--- a/src/lib/hash.c
+++ b/src/lib/hash.c
@@ -17,7 +17,7 @@ struct hash_node {
 };
 
 struct hash_table {
-       pool_t table_pool, node_pool;
+       pool_t node_pool;
 
        int frozen;
        unsigned int initial_size, nodes_count, removed_count;
@@ -50,13 +50,12 @@ static unsigned int direct_hash(const void *p)
 }
 
 struct hash_table *
-hash_table_create(pool_t table_pool, pool_t node_pool, unsigned int initial_size,
+hash_table_create(pool_t node_pool, unsigned int initial_size,
                  hash_callback_t *hash_cb, hash_cmp_callback_t *key_compare_cb)
 {
        struct hash_table *table;
 
-       table = p_new(table_pool, struct hash_table, 1);
-        table->table_pool = table_pool;
+       table = i_new(struct hash_table, 1);
        table->node_pool = node_pool;
        table->initial_size =
                I_MAX(primes_closest(initial_size), HASH_TABLE_MIN_SIZE);
@@ -66,7 +65,7 @@ hash_table_create(pool_t table_pool, pool_t node_pool, unsigned int initial_size
                direct_cmp : key_compare_cb;
 
        table->size = table->initial_size;
-       table->nodes = p_new(table_pool, struct hash_node, table->size);
+       table->nodes = i_new(struct hash_node, table->size);
        return table;
 }
 
@@ -112,8 +111,8 @@ void hash_table_destroy(struct hash_table **_table)
                destroy_node_list(table, table->free_nodes);
        }
 
-       p_free(table->table_pool, table->nodes);
-       p_free(table->table_pool, table);
+       i_free(table->nodes);
+       i_free(table);
 }
 
 void hash_table_clear(struct hash_table *table, bool free_nodes)
@@ -427,7 +426,7 @@ static bool hash_table_resize(struct hash_table *table, bool grow)
        old_nodes = table->nodes;
 
        table->size = I_MAX(next_size, HASH_TABLE_MIN_SIZE);
-       table->nodes = p_new(table->table_pool, struct hash_node, table->size);
+       table->nodes = i_new(struct hash_node, table->size);
 
        table->nodes_count = 0;
        table->removed_count = 0;
@@ -455,7 +454,7 @@ static bool hash_table_resize(struct hash_table *table, bool grow)
 
        table->frozen--;
 
-       p_free(table->table_pool, old_nodes);
+       i_free(old_nodes);
        return TRUE;
 }
 

diff --git a/src/lib/hash.h b/src/lib/hash.h
index 359c5f1338eb27dee57ed62de4e073a0e3fbb31a..5640d7340ef3f19124e3f646078900f98b217ea7 100644 (file)
--- a/src/lib/hash.h
+++ b/src/lib/hash.h
@@ -13,7 +13,7 @@ typedef int hash_cmp_callback_t(const void *p1, const void *p2);
    for smaller allocations and can also be alloconly pool. The pools must not
    be free'd before hash_table_destroy() is called. */
 struct hash_table *
-hash_table_create(pool_t table_pool, pool_t node_pool, unsigned int initial_size,
+hash_table_create(pool_t node_pool, unsigned int initial_size,
                  hash_callback_t *hash_cb, hash_cmp_callback_t *key_compare_cb)
        ATTR_NULL(4, 5);
 void hash_table_destroy(struct hash_table **table);

diff --git a/src/log/log-connection.c b/src/log/log-connection.c
index 5711788b327e33f1cda90b0090c090d037751d2b..21814ee66894a778424d1324407fc8eae80172bb 100644 (file)
--- a/src/log/log-connection.c
+++ b/src/log/log-connection.c
@@ -317,8 +317,7 @@ void log_connection_create(struct log_error_buffer *errorbuf,
        log->listen_fd = listen_fd;
        log->io = io_add(fd, IO_READ, log_connection_input, log);
        log->input = i_stream_create_fd(fd, PIPE_BUF, FALSE);
-       log->clients = hash_table_create(default_pool, default_pool, 0,
-                                        NULL, NULL);
+       log->clients = hash_table_create(default_pool, 0, NULL, NULL);
        array_idx_set(&logs_by_fd, listen_fd, &log);
 
        DLLIST_PREPEND(&log_connections, log);

diff --git a/src/login-common/login-proxy-state.c b/src/login-common/login-proxy-state.c
index d42068b9b7c1a04b266dbc82576a0fb737ff6ea3..408ff1bbeb42b15999539ec1b22b96429cb52808 100644 (file)
--- a/src/login-common/login-proxy-state.c
+++ b/src/login-common/login-proxy-state.c
@@ -48,7 +48,7 @@ struct login_proxy_state *login_proxy_state_init(const char *notify_path)
 
        state = i_new(struct login_proxy_state, 1);
        state->pool = pool_alloconly_create("login proxy state", 1024);
-       state->hash = hash_table_create(default_pool, state->pool, 0,
+       state->hash = hash_table_create(state->pool, 0,
                                        login_proxy_record_hash,
                                        login_proxy_record_cmp);
        state->notify_path = p_strdup(state->pool, notify_path);

diff --git a/src/login-common/ssl-proxy-gnutls.c b/src/login-common/ssl-proxy-gnutls.c
index 4bca155967061541eca9b1e4ab5fa2e783156fe0..9e31c79e598dcc35264330ca976b71888cf3fffc 100644 (file)
--- a/src/login-common/ssl-proxy-gnutls.c
+++ b/src/login-common/ssl-proxy-gnutls.c
@@ -519,8 +519,7 @@ void ssl_proxy_init(void)
         gnutls_certificate_set_dh_params(x509_cred, dh_params);
         gnutls_certificate_set_rsa_export_params(x509_cred, rsa_params);
 
-       ssl_proxies = hash_table_create(system_pool, system_pool, 0,
-                                       NULL, NULL);
+       ssl_proxies = hash_table_create(default_pool, 0, NULL, NULL);
        ssl_initialized = TRUE;
 }
 

diff --git a/src/login-common/ssl-proxy-openssl.c b/src/login-common/ssl-proxy-openssl.c
index 852429841c20e7e9c0a96e9b9cd8367e74c43fa3..b433411307f8089d13fb097a0ae6bc76cf64439c 100644 (file)
--- a/src/login-common/ssl-proxy-openssl.c
+++ b/src/login-common/ssl-proxy-openssl.c
@@ -1292,7 +1292,7 @@ void ssl_proxy_init(void)
 
        extdata_index = SSL_get_ex_new_index(0, dovecot, NULL, NULL, NULL);
 
-       ssl_servers = hash_table_create(default_pool, default_pool, 0,
+       ssl_servers = hash_table_create(default_pool, 0,
                                        ssl_server_context_hash,
                                        ssl_server_context_cmp);
        (void)ssl_server_context_init(login_set, ssl_set);

diff --git a/src/master/service.c b/src/master/service.c
index 49b22a4de433349c75e869c3bb399647ff7582d1..2b4d43c7d5f2f6a0f053c450db74d27b59bf3215 100644 (file)
--- a/src/master/service.c
+++ b/src/master/service.c
@@ -726,7 +726,7 @@ void services_throttle_time_sensitives(struct service_list *list,
 
 void service_pids_init(void)
 {
-       service_pids = hash_table_create(default_pool, default_pool, 0,
+       service_pids = hash_table_create(default_pool, 0,
                                         pid_hash, pid_hash_cmp);
 }
 

diff --git a/src/plugins/acl/acl-cache.c b/src/plugins/acl/acl-cache.c
index 94b0b898dccd982a879a020c9ccb366a912ec8fb..dbba6f28baad2eec8c6b70c49f62b356dd369274 100644 (file)
--- a/src/plugins/acl/acl-cache.c
+++ b/src/plugins/acl/acl-cache.c
@@ -47,10 +47,10 @@ struct acl_cache *acl_cache_init(struct acl_backend *backend,
        cache->validity_rec_size = validity_rec_size;
        cache->right_names_pool =
                pool_alloconly_create("ACL right names", 1024);
-       cache->objects = hash_table_create(default_pool, default_pool, 0,
+       cache->objects = hash_table_create(default_pool, 0,
                                           str_hash, (hash_cmp_callback_t *)strcmp);
        cache->right_name_idx_map =
-               hash_table_create(default_pool, cache->right_names_pool, 0,
+               hash_table_create(cache->right_names_pool, 0,
                                  str_hash, (hash_cmp_callback_t *)strcmp);
        i_array_init(&cache->right_idx_name_map, DEFAULT_ACL_RIGHTS_COUNT);
        return cache;

diff --git a/src/plugins/expire/doveadm-expire.c b/src/plugins/expire/doveadm-expire.c
index c511398ab0f13de27b1dd831e484fd3f268068e3..0fb0433c56fb3d770f602965f215db4522625db7 100644 (file)
--- a/src/plugins/expire/doveadm-expire.c
+++ b/src/plugins/expire/doveadm-expire.c
@@ -416,9 +416,8 @@ static void doveadm_expire_mail_init(struct doveadm_mail_cmd_context *ctx)
        ctx->v.deinit = doveadm_expire_mail_cmd_deinit;
        ctx->v.get_next_user = doveadm_expire_mail_cmd_get_next_user;
 
-       ectx->users =
-               hash_table_create(default_pool, ctx->pool, 0,
-                                 str_hash, (hash_cmp_callback_t *)strcmp);
+       ectx->users = hash_table_create(ctx->pool, 0, str_hash,
+                                       (hash_cmp_callback_t *)strcmp);
        while (mail_storage_service_all_next(ctx->storage_service, &username) > 0) {
                username_dup = p_strdup(ctx->pool, username);
                hash_table_insert(ectx->users, username_dup,

diff --git a/src/plugins/fts-lucene/fts-backend-lucene.c b/src/plugins/fts-lucene/fts-backend-lucene.c
index f16afccc58616a686254df592169e1fad684da88..58819c28052d35a227169be9f656ac459e012470 100644 (file)
--- a/src/plugins/fts-lucene/fts-backend-lucene.c
+++ b/src/plugins/fts-lucene/fts-backend-lucene.c
@@ -531,8 +531,7 @@ fts_backend_lucene_lookup_multi(struct fts_backend *_backend,
        T_BEGIN {
                struct hash_table *guids;
 
-               guids = hash_table_create(default_pool, default_pool, 0,
-                                         wstr_hash,
+               guids = hash_table_create(default_pool, 0, wstr_hash,
                                          (hash_cmp_callback_t *)wcscmp);
                ret = mailboxes_get_guids(boxes, guids, result);
                if (ret == 0) {

diff --git a/src/plugins/fts-lucene/lucene-wrapper.cc b/src/plugins/fts-lucene/lucene-wrapper.cc
index 74fd9845f83500391831fbcae6bea26510fc2f66..478b7bca3ec3952ce78b3d0894baaea8fb2e5a40 100644 (file)
--- a/src/plugins/fts-lucene/lucene-wrapper.cc
+++ b/src/plugins/fts-lucene/lucene-wrapper.cc
@@ -779,8 +779,7 @@ int lucene_index_rescan(struct lucene_index *index)
        memset(&ctx, 0, sizeof(ctx));
        ctx.index = index;
        ctx.pool = pool_alloconly_create("guids", 1024);
-       ctx.guids = hash_table_create(default_pool, ctx.pool, 0,
-                                     guid_128_hash, guid_128_cmp);
+       ctx.guids = hash_table_create(ctx.pool, 0, guid_128_hash, guid_128_cmp);
        i_array_init(&ctx.uids, 128);
 
        if (ret > 0) try {

diff --git a/src/plugins/fts-solr/fts-backend-solr-old.c b/src/plugins/fts-solr/fts-backend-solr-old.c
index 1527ca84e5c2e4b7e2139d4645cffb565661706c..92d729fdcb5e4db143b998bf5ab3a907d88e69ba 100644 (file)
--- a/src/plugins/fts-solr/fts-backend-solr-old.c
+++ b/src/plugins/fts-solr/fts-backend-solr-old.c
@@ -738,7 +738,7 @@ solr_search_multi(struct solr_fts_backend *backend, string_t *str,
        else
                str_append(str, "%22%22");
 
-       mailboxes = hash_table_create(default_pool, default_pool, 0,
+       mailboxes = hash_table_create(default_pool, 0,
                                      str_hash, (hash_cmp_callback_t *)strcmp);
        str_append(str, "%2B(");
        len = str_len(str);

diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
index f1233ced0f027159f802dedcca8c0d28666694e0..1253bdc741070854bb3a137de09b04c38bf30ef7 100644 (file)
--- a/src/plugins/fts-solr/fts-backend-solr.c
+++ b/src/plugins/fts-solr/fts-backend-solr.c
@@ -814,7 +814,7 @@ solr_search_multi(struct fts_backend *_backend, string_t *str,
        else
                str_append(str, "%22%22");
 
-       mailboxes = hash_table_create(default_pool, default_pool, 0,
+       mailboxes = hash_table_create(default_pool, 0,
                                      str_hash, (hash_cmp_callback_t *)strcmp);
        str_append(str, "%2B(");
        len = str_len(str);

diff --git a/src/plugins/fts-solr/solr-connection.c b/src/plugins/fts-solr/solr-connection.c
index 39c37ca9d7bddb5167a35d58a6c2ed8c23fe3fc7..f33cb46e4f90ee61e635f3a2d14be8d69a0c30a3 100644 (file)
--- a/src/plugins/fts-solr/solr-connection.c
+++ b/src/plugins/fts-solr/solr-connection.c
@@ -420,7 +420,7 @@ int solr_connection_select(struct solr_connection *conn, const char *query,
        memset(&solr_lookup_context, 0, sizeof(solr_lookup_context));
        solr_lookup_context.result_pool = pool;
        solr_lookup_context.mailboxes =
-               hash_table_create(default_pool, default_pool, 0,
+               hash_table_create(default_pool, 0,
                                  str_hash, (hash_cmp_callback_t *)strcmp);
        p_array_init(&solr_lookup_context.results, pool, 32);
 

diff --git a/src/plugins/fts/fts-expunge-log.c b/src/plugins/fts/fts-expunge-log.c
index 6e05a01ff597ab78d11e56a877ae9b7507eb08c0..a3877069499e64d79aea6cd519a007319559ec8d 100644 (file)
--- a/src/plugins/fts/fts-expunge-log.c
+++ b/src/plugins/fts/fts-expunge-log.c
@@ -177,9 +177,7 @@ fts_expunge_log_append_begin(struct fts_expunge_log *log)
        ctx = p_new(pool, struct fts_expunge_log_append_ctx, 1);
        ctx->log = log;
        ctx->pool = pool;
-       ctx->mailboxes =
-               hash_table_create(default_pool, pool, 0,
-                                 guid_128_hash, guid_128_cmp);
+       ctx->mailboxes = hash_table_create(pool, 0, guid_128_hash, guid_128_cmp);
 
        if (fts_expunge_log_reopen_if_needed(log, TRUE) < 0)
                ctx->failed = TRUE;

diff --git a/src/pop3/pop3-commands.c b/src/pop3/pop3-commands.c
index 82bccfd3fc02a637ed524c3be65b700221acd326..d82591ea86e9ba4502e3afdda8d5f50b14089e8d 100644 (file)
--- a/src/pop3/pop3-commands.c
+++ b/src/pop3/pop3-commands.c
@@ -752,8 +752,8 @@ static void client_uidls_save(struct client *client)
 
        uidl_duplicates_rename =
                strcmp(client->set->pop3_uidl_duplicates, "rename") == 0;
-       prev_uidls = hash_table_create(default_pool, default_pool, 0,
-                                     str_hash, (hash_cmp_callback_t *)strcmp);
+       prev_uidls = hash_table_create(default_pool, 0,
+                                      str_hash, (hash_cmp_callback_t *)strcmp);
        client->uidl_pool = pool_alloconly_create("message uidls", 1024);
        client->message_uidls = p_new(client->uidl_pool, const char *,
                                      client->messages_count+1);

diff --git a/src/replication/aggregator/replicator-connection.c b/src/replication/aggregator/replicator-connection.c
index 70fcd344e66bf60cd421246ea993a8a30b4c9504..3378bf692b75cd46ac4d468fc73faf85c695b019 100644 (file)
--- a/src/replication/aggregator/replicator-connection.c
+++ b/src/replication/aggregator/replicator-connection.c
@@ -209,8 +209,7 @@ static struct replicator_connection *replicator_connection_create(void)
 
        conn = i_new(struct replicator_connection, 1);
        conn->fd = -1;
-       conn->requests = hash_table_create(default_pool, default_pool,
-                                          0, NULL, NULL);
+       conn->requests = hash_table_create(default_pool, 0, NULL, NULL);
        for (i = REPLICATION_PRIORITY_LOW; i <= REPLICATION_PRIORITY_SYNC; i++)
                conn->queue[i] = buffer_create_dynamic(default_pool, 1024);
        return conn;

diff --git a/src/replication/replicator/replicator-queue.c b/src/replication/replicator/replicator-queue.c
index 9a546311f28c0719dc08c35dfdefe141abb1fdde..e99b6b8ff5a1c9a360960896f1836e4cbd50a343 100644 (file)
--- a/src/replication/replicator/replicator-queue.c
+++ b/src/replication/replicator/replicator-queue.c
@@ -67,9 +67,8 @@ struct replicator_queue *replicator_queue_init(unsigned int full_sync_interval)
        queue = i_new(struct replicator_queue, 1);
        queue->full_sync_interval = full_sync_interval;
        queue->user_queue = priorityq_init(user_priority_cmp, 1024);
-       queue->user_hash =
-               hash_table_create(default_pool, default_pool, 1024,
-                                 str_hash, (hash_cmp_callback_t *)strcmp);
+       queue->user_hash = hash_table_create(default_pool, 1024, str_hash,
+                                            (hash_cmp_callback_t *)strcmp);
        i_array_init(&queue->sync_lookups, 32);
        return queue;
 }

diff --git a/src/stats/mail-domain.c b/src/stats/mail-domain.c
index c96aba8a384aa4b8d4c8af4cb3ef52b3a7860d82..04f6a4b815a44309753a81339f7dac56563d5d7c 100644 (file)
--- a/src/stats/mail-domain.c
+++ b/src/stats/mail-domain.c
@@ -113,7 +113,7 @@ void mail_domains_free_memory(void)
 void mail_domains_init(void)
 {
        mail_domains_hash =
-               hash_table_create(default_pool, default_pool, 0,
+               hash_table_create(default_pool, 0,
                                  str_hash, (hash_cmp_callback_t *)strcmp);
 }
 

diff --git a/src/stats/mail-ip.c b/src/stats/mail-ip.c
index bbc543f2ad45458794fa062eaeca4f7cc82bddde..b01d60ab8b619d40cc270630f02cd150879b3e0d 100644 (file)
--- a/src/stats/mail-ip.c
+++ b/src/stats/mail-ip.c
@@ -109,7 +109,7 @@ void mail_ips_free_memory(void)
 void mail_ips_init(void)
 {
        mail_ips_hash =
-               hash_table_create(default_pool, default_pool, 0,
+               hash_table_create(default_pool, 0,
                                  (hash_callback_t *)net_ip_hash,
                                  (hash_cmp_callback_t *)net_ip_cmp);
 }

diff --git a/src/stats/mail-session.c b/src/stats/mail-session.c
index a2105e95401a9d2cf4bb03fe6a723663293ccd57..1355ff32515aedf459fe6d63dc55c89e05f7e858 100644 (file)
--- a/src/stats/mail-session.c
+++ b/src/stats/mail-session.c
@@ -292,7 +292,7 @@ void mail_sessions_init(void)
        session_guid_warn_hide_until =
                ioloop_time + SESSION_GUID_WARN_HIDE_SECS;
        mail_sessions_hash =
-               hash_table_create(default_pool, default_pool, 0,
+               hash_table_create(default_pool, 0,
                                  guid_128_hash, guid_128_cmp);
 }
 

diff --git a/src/stats/mail-user.c b/src/stats/mail-user.c
index e0bfc72b9b337cc230dd34ebe593c91311cc7e40..50f13be8ff168f0ce2cde3c668ee59e606690a16 100644 (file)
--- a/src/stats/mail-user.c
+++ b/src/stats/mail-user.c
@@ -131,7 +131,7 @@ void mail_users_free_memory(void)
 void mail_users_init(void)
 {
        mail_users_hash =
-               hash_table_create(default_pool, default_pool, 0,
+               hash_table_create(default_pool, 0,
                                  str_hash, (hash_cmp_callback_t *)strcmp);
 }