dovecot-2.2: hash_table_create(): Removed table_pool parameter.

dovecot at dovecot.org dovecot at dovecot.org
Sun Aug 19 07:20:24 EEST 2012


details:   http://hg.dovecot.org/dovecot-2.2/rev/1ce71b5bc94a
changeset: 14917:1ce71b5bc94a
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Aug 19 07:20:13 2012 +0300
description:
hash_table_create(): Removed table_pool parameter.
Every single caller was using default_pool there, so there's no point in
having it.

diffstat:

 src/anvil/connect-limit.c                                |   4 +-
 src/anvil/penalty.c                                      |   2 +-
 src/auth/auth-cache.c                                    |   2 +-
 src/auth/auth-request-handler.c                          |   2 +-
 src/auth/db-checkpassword.c                              |   2 +-
 src/auth/db-ldap.c                                       |   2 +-
 src/auth/db-passwd-file.c                                |   5 +--
 src/auth/mech-otp-skey-common.c                          |   3 +-
 src/config/config-request.c                              |   4 +-
 src/director/director-test.c                             |   6 ++--
 src/director/user-directory.c                            |   3 +-
 src/doveadm/doveadm-director.c                           |   2 +-
 src/doveadm/doveadm-kick.c                               |   2 +-
 src/doveadm/doveadm-log.c                                |   2 +-
 src/doveadm/doveadm-mail-server.c                        |   3 +-
 src/doveadm/doveadm-stats.c                              |   2 +-
 src/doveadm/doveadm-who.c                                |   2 +-
 src/doveadm/dsync/dsync-brain.c                          |   3 +-
 src/doveadm/dsync/dsync-mailbox-export.c                 |   4 +-
 src/doveadm/dsync/dsync-mailbox-import.c                 |   4 +-
 src/doveadm/dsync/dsync-mailbox-tree.c                   |   6 ++--
 src/doveadm/dsync/dsync-transaction-log-scan.c           |   3 +-
 src/indexer/indexer-queue.c                              |   2 +-
 src/lib-auth/auth-server-connection.c                    |   2 +-
 src/lib-dict/dict-file.c                                 |   2 +-
 src/lib-index/mail-cache.c                               |   2 +-
 src/lib-index/mail-index.c                               |   2 +-
 src/lib-lda/duplicate.c                                  |   2 +-
 src/lib-master/master-auth.c                             |   3 +-
 src/lib-master/master-login-auth.c                       |   2 +-
 src/lib-master/master-service-settings-cache.c           |   4 +-
 src/lib-settings/settings-parser.c                       |   7 ++---
 src/lib-sql/sql-db-cache.c                               |   2 +-
 src/lib-storage/index/dbox-multi/mdbox-purge.c           |   2 +-
 src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c |   2 +-
 src/lib-storage/index/index-thread-finish.c              |   2 +-
 src/lib-storage/index/maildir/maildir-keywords.c         |   4 +-
 src/lib-storage/index/maildir/maildir-uidlist.c          |   4 +-
 src/lib-storage/list/mailbox-list-index.c                |   6 +---
 src/lib-storage/mailbox-guid-cache.c                     |   3 +-
 src/lib/child-wait.c                                     |   3 +-
 src/lib/hash.c                                           |  17 +++++++--------
 src/lib/hash.h                                           |   2 +-
 src/log/log-connection.c                                 |   3 +-
 src/login-common/login-proxy-state.c                     |   2 +-
 src/login-common/ssl-proxy-gnutls.c                      |   3 +-
 src/login-common/ssl-proxy-openssl.c                     |   2 +-
 src/master/service.c                                     |   2 +-
 src/plugins/acl/acl-cache.c                              |   4 +-
 src/plugins/expire/doveadm-expire.c                      |   5 +--
 src/plugins/fts-lucene/fts-backend-lucene.c              |   3 +-
 src/plugins/fts-lucene/lucene-wrapper.cc                 |   3 +-
 src/plugins/fts-solr/fts-backend-solr-old.c              |   2 +-
 src/plugins/fts-solr/fts-backend-solr.c                  |   2 +-
 src/plugins/fts-solr/solr-connection.c                   |   2 +-
 src/plugins/fts/fts-expunge-log.c                        |   4 +--
 src/pop3/pop3-commands.c                                 |   4 +-
 src/replication/aggregator/replicator-connection.c       |   3 +-
 src/replication/replicator/replicator-queue.c            |   5 +--
 src/stats/mail-domain.c                                  |   2 +-
 src/stats/mail-ip.c                                      |   2 +-
 src/stats/mail-session.c                                 |   2 +-
 src/stats/mail-user.c                                    |   2 +-
 63 files changed, 89 insertions(+), 111 deletions(-)

diffs (truncated from 932 to 300 lines):

diff -r ecb92e343152 -r 1ce71b5bc94a src/anvil/connect-limit.c
--- a/src/anvil/connect-limit.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/anvil/connect-limit.c	Sun Aug 19 07:20:13 2012 +0300
@@ -46,10 +46,10 @@
 
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/anvil/penalty.c
--- a/src/anvil/penalty.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/anvil/penalty.c	Sun Aug 19 07:20:13 2012 +0300
@@ -51,7 +51,7 @@
 
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/auth/auth-cache.c
--- a/src/auth/auth-cache.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/auth/auth-cache.c	Sun Aug 19 07:20:13 2012 +0300
@@ -221,7 +221,7 @@
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/auth/auth-request-handler.c
--- a/src/auth/auth-request-handler.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/auth/auth-request-handler.c	Sun Aug 19 07:20:13 2012 +0300
@@ -52,7 +52,7 @@
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/auth/db-checkpassword.c
--- a/src/auth/db-checkpassword.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/auth/db-checkpassword.c	Sun Aug 19 07:20:13 2012 +0300
@@ -545,7 +545,7 @@
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/auth/db-ldap.c
--- a/src/auth/db-ldap.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/auth/db-ldap.c	Sun Aug 19 07:20:13 2012 +0300
@@ -1196,7 +1196,7 @@
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/auth/db-passwd-file.c
--- a/src/auth/db-passwd-file.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/auth/db-passwd-file.c	Sun Aug 19 07:20:13 2012 +0300
@@ -194,7 +194,7 @@
 	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->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 -r ecb92e343152 -r 1ce71b5bc94a src/auth/mech-otp-skey-common.c
--- a/src/auth/mech-otp-skey-common.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/auth/mech-otp-skey-common.c	Sun Aug 19 07:20:13 2012 +0300
@@ -20,8 +20,7 @@
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/config/config-request.c
--- a/src/config/config-request.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/config/config-request.c	Sun Aug 19 07:20:13 2012 +0300
@@ -361,8 +361,8 @@
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/director/director-test.c
--- a/src/director/director-test.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/director/director-test.c	Sun Aug 19 07:20:13 2012 +0300
@@ -532,9 +532,9 @@
 
 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 -r ecb92e343152 -r 1ce71b5bc94a src/director/user-directory.c
--- a/src/director/user-directory.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/director/user-directory.c	Sun Aug 19 07:20:13 2012 +0300
@@ -225,8 +225,7 @@
 		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 -r ecb92e343152 -r 1ce71b5bc94a src/doveadm/doveadm-director.c
--- a/src/doveadm/doveadm-director.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/doveadm/doveadm-director.c	Sun Aug 19 07:20:13 2012 +0300
@@ -295,7 +295,7 @@
 		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 -r ecb92e343152 -r 1ce71b5bc94a src/doveadm/doveadm-kick.c
--- a/src/doveadm/doveadm-kick.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/doveadm/doveadm-kick.c	Sun Aug 19 07:20:13 2012 +0300
@@ -179,7 +179,7 @@
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/doveadm/doveadm-log.c
--- a/src/doveadm/doveadm-log.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/doveadm/doveadm-log.c	Sun Aug 19 07:20:13 2012 +0300
@@ -222,7 +222,7 @@
 
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/doveadm/doveadm-mail-server.c
--- a/src/doveadm/doveadm-mail-server.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/doveadm/doveadm-mail-server.c	Sun Aug 19 07:20:13 2012 +0300
@@ -38,8 +38,7 @@
 
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/doveadm/doveadm-stats.c
--- a/src/doveadm/doveadm-stats.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/doveadm/doveadm-stats.c	Sun Aug 19 07:20:13 2012 +0300
@@ -478,7 +478,7 @@
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/doveadm/doveadm-who.c
--- a/src/doveadm/doveadm-who.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/doveadm/doveadm-who.c	Sun Aug 19 07:20:13 2012 +0300
@@ -274,7 +274,7 @@
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/doveadm/dsync/dsync-brain.c
--- a/src/doveadm/dsync/dsync-brain.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/doveadm/dsync/dsync-brain.c	Sun Aug 19 07:20:13 2012 +0300
@@ -48,8 +48,7 @@
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/doveadm/dsync/dsync-mailbox-export.c
--- a/src/doveadm/dsync/dsync-mailbox-export.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/doveadm/dsync/dsync-mailbox-export.c	Sun Aug 19 07:20:13 2012 +0300
@@ -392,7 +392,7 @@
 
 	/* 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 @@
 		(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 -r ecb92e343152 -r 1ce71b5bc94a src/doveadm/dsync/dsync-mailbox-import.c
--- a/src/doveadm/dsync/dsync-mailbox-import.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/doveadm/dsync/dsync-mailbox-import.c	Sun Aug 19 07:20:13 2012 +0300
@@ -135,10 +135,10 @@
 	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 -r ecb92e343152 -r 1ce71b5bc94a src/doveadm/dsync/dsync-mailbox-tree.c
--- a/src/doveadm/dsync/dsync-mailbox-tree.c	Sat Aug 18 17:05:59 2012 +0300
+++ b/src/doveadm/dsync/dsync-mailbox-tree.c	Sun Aug 19 07:20:13 2012 +0300
@@ -211,7 +211,7 @@
 
 	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 @@
 	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 @@
 


More information about the dovecot-cvs mailing list